From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Wed, 20 Mar 2024 16:13:16 +0000 (+0000)
Subject: auth: struct ldap_settings - Fix ldap_ldap_version -> ldap_version
X-Git-Tag: 2.4.1~779
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=782858b77e4123b9026d3207fb1cb7496c4cc888;p=thirdparty%2Fdovecot%2Fcore.git

auth: struct ldap_settings - Fix ldap_ldap_version -> ldap_version
---

diff --git a/src/auth/db-ldap-settings.c b/src/auth/db-ldap-settings.c
index 1b7e7e2418..af37205f4b 100644
--- a/src/auth/db-ldap-settings.c
+++ b/src/auth/db-ldap-settings.c
@@ -38,7 +38,7 @@ static const struct setting_define ldap_setting_defines[] = {
 	DEF(STR, deref),
 	DEF(STR, scope),
 	DEF(STR, base),
-	DEF(UINT, ldap_version),
+	DEF(UINT, version),
 	DEF(STR, debug_level),
 	DEF(STR, user_attrs),
 	DEF(STR, user_filter),
@@ -72,7 +72,7 @@ static const struct ldap_settings ldap_default_settings = {
 	.deref = "never",
 	.scope = "subtree",
 	.base = "",
-	.ldap_version = 3,
+	.version = 3,
 	.debug_level = "0",
 	.user_attrs = "homeDirectory=home,uidNumber=uid,gidNumber=gid",
 	.user_filter = "(&(objectClass=posixAccount)(uid=%u))",
diff --git a/src/auth/db-ldap-settings.h b/src/auth/db-ldap-settings.h
index 668266f4a7..1bdb51afc5 100644
--- a/src/auth/db-ldap-settings.h
+++ b/src/auth/db-ldap-settings.h
@@ -36,7 +36,7 @@ struct ldap_settings {
 
 	const char *default_pass_scheme;
 
-	unsigned int ldap_version;
+	unsigned int version;
 
 	int ldap_deref;
 	int ldap_scope;
diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index f02fbc185e..f6a758967e 100644
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -894,9 +894,9 @@ static void db_ldap_set_options(struct ldap_connection *conn)
 	}
 #endif
 
-	unsigned int ldap_version = conn->set->ldap_version;
-	db_ldap_set_opt(conn->ld, LDAP_OPT_PROTOCOL_VERSION, &ldap_version,
-			"protocol_version", dec2str(ldap_version));
+	db_ldap_set_opt(conn->ld, LDAP_OPT_PROTOCOL_VERSION,
+			&conn->set->version,
+			"protocol_version", dec2str(conn->set->version));
 	db_ldap_set_tls_options(conn);
 }
 
@@ -1719,7 +1719,7 @@ struct ldap_connection *db_ldap_init(struct event *event)
 	if (conn->set->sasl_bind)
 		i_fatal("LDAP: ldap_sasl_bind=yes but no SASL support compiled in");
 #endif
-	if (conn->set->ldap_version < 3) {
+	if (conn->set->version < 3) {
 		if (conn->set->sasl_bind)
 			i_fatal("LDAP: ldap_sasl_bind=yes requires ldap_version=3");
 		if (conn->set->tls)