From db2d60100cc8728db5035de6da2ebb02af47415b Mon Sep 17 00:00:00 2001 From: reshke Date: Tue, 18 Jul 2023 13:24:14 +0500 Subject: [PATCH] Log return code of basedn simple bind only on error (#512) * Update ldap.c * Apply fmrt * Apply fmt again --- sources/frontend.c | 32 ++++++++++++++++---------------- sources/ldap.c | 6 ++++-- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/sources/frontend.c b/sources/frontend.c index 7f1736d12..736fec555 100644 --- a/sources/frontend.c +++ b/sources/frontend.c @@ -2215,22 +2215,22 @@ void od_frontend(void *arg) &instance->logger, "catchup", client, NULL, "replicaion lag too big, connection rejected: %s %s", client->rule->db_is_default ? - "(unknown database)" : - client->startup.database.value, + "(unknown database)" : + client->startup.database.value, client->rule->user_is_default ? - "(unknown user)" : - client->startup.user.value); + "(unknown user)" : + client->startup.user.value); od_frontend_fatal( client, KIWI_INVALID_AUTHORIZATION_SPECIFICATION, "replicaion lag too big, connection rejected: %s %s", client->rule->db_is_default ? - "(unknown database)" : - client->startup.database.value, + "(unknown database)" : + client->startup.database.value, client->rule->user_is_default ? - "(unknown user)" : - client->startup.user.value); + "(unknown user)" : + client->startup.user.value); rc = NOT_OK_RESPONSE; } else { rc = od_auth_frontend(client); @@ -2238,11 +2238,11 @@ void od_frontend(void *arg) "ip '%s' user '%s.%s': host based authentication allowed", client_ip, client->rule->db_is_default ? - "(unknown database)" : - client->startup.database.value, + "(unknown database)" : + client->startup.database.value, client->rule->user_is_default ? - "(unknown user)" : - client->startup.user.value); + "(unknown user)" : + client->startup.user.value); } } else { od_error( @@ -2250,11 +2250,11 @@ void od_frontend(void *arg) "ip '%s' user '%s.%s': host based authentication rejected", client_ip, client->rule->db_is_default ? - "(unknown database)" : - client->startup.database.value, + "(unknown database)" : + client->startup.database.value, client->rule->user_is_default ? - "(unknown user)" : - client->startup.user.value); + "(unknown user)" : + client->startup.user.value); od_frontend_error(client, KIWI_INVALID_PASSWORD, "host based authentication rejected"); diff --git a/sources/ldap.c b/sources/ldap.c index 66718667c..29bc495b4 100644 --- a/sources/ldap.c +++ b/sources/ldap.c @@ -305,8 +305,10 @@ od_retcode_t od_ldap_server_init(od_logger_t *logger, od_ldap_server_t *server, server->endpoint->ldapbindpasswd : ""); - od_debug(logger, "auth_ldap", NULL, NULL, - "basednn simple bind result: %d", rc); + if (rc) { + od_error(logger, "auth_ldap", NULL, NULL, + "basednn simple bind result: %d", rc); + } return rc; }