Log return code of basedn simple bind only on error (#512)

* Update ldap.c * Apply fmrt * Apply fmt again
yandex · Jul 18, 2023 · db2d601 · db2d601
1 parent be54843
commit db2d601
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/sources/frontend.c b/sources/frontend.c
@@ -2215,46 +2215,46 @@ 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);
 			od_log(&instance->logger, "auth", client, NULL,
 			       "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(
 			&instance->logger, "auth", client, NULL,
 			"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
@@ -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;
 }