From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Thu, 21 Mar 2024 10:26:19 +0000 (+0000)
Subject: auth: struct ldap_settings - Rename parsed fields into parsed_xxx
X-Git-Tag: 2.4.1~776
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0365e5545f0bde7d925345173d4432b98ee1818e;p=thirdparty%2Fdovecot%2Fcore.git

auth: struct ldap_settings - Rename parsed fields into parsed_xxx
---

diff --git a/src/auth/db-ldap-settings.c b/src/auth/db-ldap-settings.c
index 6c68270887..58e5433918 100644
--- a/src/auth/db-ldap-settings.c
+++ b/src/auth/db-ldap-settings.c
@@ -149,13 +149,13 @@ static bool ldap_setting_check(void *_set, pool_t pool ATTR_UNUSED,
 {
 	struct ldap_settings *set = _set;
 
-        if (ldap_parse_deref(set->deref, &set->ldap_deref) < 0) {
+        if (ldap_parse_deref(set->deref, &set->parsed_deref) < 0) {
 		*error_r = t_strdup_printf("Unknown ldap_deref option '%s'",
 					   set->deref);
 		return FALSE;
 	}
 
-	if (ldap_parse_scope(set->scope, &set->ldap_scope) < 0) {
+	if (ldap_parse_scope(set->scope, &set->parsed_scope) < 0) {
 		*error_r = t_strdup_printf("Unknown ldap_scope option '%s'",
 					   set->scope);
 		return FALSE;
diff --git a/src/auth/db-ldap-settings.h b/src/auth/db-ldap-settings.h
index 9bdb01e273..9c88a7e44c 100644
--- a/src/auth/db-ldap-settings.h
+++ b/src/auth/db-ldap-settings.h
@@ -38,8 +38,6 @@ struct ldap_settings {
 
 	unsigned int version;
 
-	int ldap_deref;
-	int ldap_scope;
 	int ldap_tls_require_cert_parsed;
 
 	uid_t uid;
@@ -49,6 +47,10 @@ struct ldap_settings {
 	bool starttls;
 	bool sasl_bind;
 	bool blocking;
+
+	/* parsed */
+	int parsed_deref;
+	int parsed_scope;
 };
 
 extern const struct setting_parser_info ldap_setting_parser_info;
diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index c6124f67df..f256f13b71 100644
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -218,7 +218,7 @@ static int db_ldap_request_search(struct ldap_connection *conn,
 
 	ldap_search_ext(
 		conn->ld, *srequest->base == '\0' ? NULL : srequest->base,
-		conn->set->ldap_scope, srequest->filter, srequest->attributes,
+		conn->set->parsed_scope, srequest->filter, srequest->attributes,
 		0, NULL, NULL, 0, 0, &request->msgid);
 	if (request->msgid == -1) {
 		e_error(authdb_event(request->auth_request),
@@ -883,7 +883,7 @@ static void db_ldap_set_options(struct ldap_connection *conn)
 		i_fatal("LDAP: Can't set network-timeout: %s", ldap_err2string(ret));
 #endif
 
-	db_ldap_set_opt(conn->ld, LDAP_OPT_DEREF, &conn->set->ldap_deref,
+	db_ldap_set_opt(conn->ld, LDAP_OPT_DEREF, &conn->set->parsed_deref,
 			"ldap_deref", conn->set->deref);
 #ifdef LDAP_OPT_DEBUG_LEVEL
 	int debug_level;