From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Fri, 20 Sep 2024 14:45:42 +0000 (+0000)
Subject: auth: ldap_pre_settings_pre_check() - Rename into ldap_pre_settings_post_check()
X-Git-Tag: 2.4.0~165
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=502b3930534e30f3dc2b45fe5eaeb0bac25da99d;p=thirdparty%2Fdovecot%2Fcore.git

auth: ldap_pre_settings_pre_check() - Rename into ldap_pre_settings_post_check()
---

diff --git a/src/auth/db-ldap-settings.c b/src/auth/db-ldap-settings.c
index 1007502940..0bfeeab041 100644
--- a/src/auth/db-ldap-settings.c
+++ b/src/auth/db-ldap-settings.c
@@ -216,7 +216,7 @@ int ldap_setting_post_check(const struct ldap_settings *set, const char **error_
 	return 0;
 }
 
-int ldap_pre_settings_pre_check(const struct ldap_pre_settings *set, const char **error_r)
+int ldap_pre_settings_post_check(const struct ldap_pre_settings *set, const char **error_r)
 {
 	if (*set->base == '\0') {
 		*error_r = "No ldap_base given";
diff --git a/src/auth/db-ldap-settings.h b/src/auth/db-ldap-settings.h
index 6d95ff4902..0460f218e3 100644
--- a/src/auth/db-ldap-settings.h
+++ b/src/auth/db-ldap-settings.h
@@ -65,6 +65,6 @@ extern const struct setting_parser_info ldap_pre_setting_parser_info;
 extern const struct setting_parser_info ldap_post_setting_parser_info;
 
 int ldap_setting_post_check(const struct ldap_settings *set, const char **error_r);
-int ldap_pre_settings_pre_check(const struct ldap_pre_settings *set, const char **error_r);
+int ldap_pre_settings_post_check(const struct ldap_pre_settings *set, const char **error_r);
 
 #endif
diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
index fca6b8619d..3cde6dff30 100644
--- a/src/auth/passdb-ldap.c
+++ b/src/auth/passdb-ldap.c
@@ -373,7 +373,7 @@ ldap_verify_plain(struct auth_request *request,
 	const struct ldap_pre_settings *ldap_pre = NULL;
 	if (settings_get(event, &ldap_pre_setting_parser_info, 0,
 			 &ldap_pre, &error) < 0 ||
-	    ldap_pre_settings_pre_check(ldap_pre, &error) < 0) {
+	    ldap_pre_settings_post_check(ldap_pre, &error) < 0) {
 		e_error(event, "%s", error);
 		callback(PASSDB_RESULT_INTERNAL_FAILURE, request);
 		settings_free(ldap_pre);
@@ -411,7 +411,7 @@ static void ldap_lookup_credentials(struct auth_request *request,
 	const struct ldap_pre_settings *ldap_pre = NULL;
 	if (settings_get(event, &ldap_pre_setting_parser_info, 0,
 			 &ldap_pre, &error) < 0 ||
-	    ldap_pre_settings_pre_check(ldap_pre, &error) < 0) {
+	    ldap_pre_settings_post_check(ldap_pre, &error) < 0) {
 		e_error(event, "%s", error);
 		passdb_ldap_request_fail(ldap_request, PASSDB_RESULT_INTERNAL_FAILURE);
 		settings_free(ldap_pre);
diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c
index 4b7c9e784c..eef7f5a1b5 100644
--- a/src/auth/userdb-ldap.c
+++ b/src/auth/userdb-ldap.c
@@ -125,7 +125,7 @@ static void userdb_ldap_lookup(struct auth_request *auth_request,
 	const struct ldap_pre_settings *ldap_pre = NULL;
 	if (settings_get(event, &ldap_pre_setting_parser_info, 0,
 			 &ldap_pre, &error) < 0 ||
-	    ldap_pre_settings_pre_check(ldap_pre, &error) < 0) {
+	    ldap_pre_settings_post_check(ldap_pre, &error) < 0) {
 		e_error(event, "%s", error);
 		callback(USERDB_RESULT_INTERNAL_FAILURE, auth_request);
 		settings_free(ldap_pre);
@@ -255,7 +255,7 @@ userdb_ldap_iterate_init(struct auth_request *auth_request,
 	const struct ldap_pre_settings *ldap_pre = NULL;
 	if (settings_get(event, &ldap_pre_setting_parser_info, 0,
 			 &ldap_pre, &error) < 0 ||
-	    ldap_pre_settings_pre_check(ldap_pre, &error) < 0) {
+	    ldap_pre_settings_post_check(ldap_pre, &error) < 0) {
 		e_error(event, "%s", error);
 		settings_free(ldap_pre);
 		ctx->ctx.failed = TRUE;