From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Wed, 17 Jul 2024 08:14:05 +0000 (+0000)
Subject: auth: ldap - Rename ldap_bind* into passdb_ldap_bind*
X-Git-Tag: 2.4.1~769
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7de838da3ee653db39ce0c76a81e638e7532bc8;p=thirdparty%2Fdovecot%2Fcore.git

auth: ldap - Rename ldap_bind* into passdb_ldap_bind*
---

diff --git a/src/auth/db-ldap-settings.c b/src/auth/db-ldap-settings.c
index e4eb3ebe55..0717198005 100644
--- a/src/auth/db-ldap-settings.c
+++ b/src/auth/db-ldap-settings.c
@@ -14,6 +14,8 @@ static bool ldap_setting_check(void *_set, pool_t pool, const char **error_r);
 #undef DEF
 #define DEF(type, name) \
 	SETTING_DEFINE_STRUCT_##type("ldap_"#name, name, struct ldap_settings)
+#define DEFN(type, field, name) \
+	SETTING_DEFINE_STRUCT_##type(#name, field, struct ldap_settings)
 
 static const struct setting_define ldap_setting_defines[] = {
 	{ .type = SET_FILTER_NAME, .key = "passdb_ldap", },
@@ -22,8 +24,8 @@ static const struct setting_define ldap_setting_defines[] = {
 	DEF(STR, uris),
 	DEF(STR, auth_dn),
 	DEF(STR, auth_dn_password),
-	DEF(BOOL, auth_bind),
-	DEF(STR, auth_bind_userdn),
+	DEFN(BOOL, passdb_ldap_bind, passdb_ldap_bind),
+	DEFN(STR, passdb_ldap_bind_userdn, passdb_ldap_bind_userdn),
 	DEF(BOOL, auth_sasl_bind),
 	DEF(STR, auth_sasl_mechanism),
 	DEF(STR, auth_sasl_realm),
@@ -48,8 +50,8 @@ static const struct ldap_settings ldap_default_settings = {
 	.uris = "",
 	.auth_dn = "",
 	.auth_dn_password = "",
-	.auth_bind = FALSE,
-	.auth_bind_userdn = "",
+	.passdb_ldap_bind = FALSE,
+	.passdb_ldap_bind_userdn = "",
 	.auth_sasl_bind = FALSE,
 	.auth_sasl_mechanism = "",
 	.auth_sasl_realm = "",
diff --git a/src/auth/db-ldap-settings.h b/src/auth/db-ldap-settings.h
index be964164d1..9c5a8dabe1 100644
--- a/src/auth/db-ldap-settings.h
+++ b/src/auth/db-ldap-settings.h
@@ -8,7 +8,7 @@ struct ldap_settings {
 	const char *uris;
 	const char *auth_dn;
 	const char *auth_dn_password;
-	const char *auth_bind_userdn;
+	const char *passdb_ldap_bind_userdn;
 
 	const char *auth_sasl_mechanism;
 	const char *auth_sasl_realm;
@@ -32,7 +32,7 @@ struct ldap_settings {
 	uid_t uid;
 	gid_t gid;
 
-	bool auth_bind;
+	bool passdb_ldap_bind;
 	bool auth_sasl_bind;
 	bool starttls;
 
diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
index 4d28368533..4996d6dc55 100644
--- a/src/auth/passdb-ldap.c
+++ b/src/auth/passdb-ldap.c
@@ -386,11 +386,11 @@ ldap_verify_plain_auth_bind_userdn(struct auth_request *auth_request,
 	brequest->request.type = LDAP_REQUEST_TYPE_BIND;
 
 	dn = t_str_new(512);
-	if (auth_request_var_expand(dn, conn->set->auth_bind_userdn,
+	if (auth_request_var_expand(dn, conn->set->passdb_ldap_bind_userdn,
 				    auth_request, ldap_escape, &error) <= 0) {
 		e_error(authdb_event(auth_request),
-			"Failed to expand auth_bind_userdn=%s: %s",
-			conn->set->auth_bind_userdn, error);
+			"Failed to expand passdb_ldap_bind_userdn=%s: %s",
+			conn->set->passdb_ldap_bind_userdn, error);
 		passdb_ldap_request_fail(request, PASSDB_RESULT_INTERNAL_FAILURE);
 		return;
 	}
@@ -423,9 +423,9 @@ ldap_verify_plain(struct auth_request *request,
 	auth_request_ref(request);
 	ldap_request->request.ldap.auth_request = request;
 
-	if (!conn->set->auth_bind)
+	if (!conn->set->passdb_ldap_bind)
 		ldap_lookup_pass(request, ldap_request, TRUE);
-	else if (conn->set->auth_bind_userdn == NULL)
+	else if (conn->set->passdb_ldap_bind_userdn == NULL)
 		ldap_bind_lookup_dn(request, ldap_request);
 	else
 		ldap_verify_plain_auth_bind_userdn(request, ldap_request);
@@ -449,7 +449,7 @@ static void ldap_lookup_credentials(struct auth_request *request,
 	/* with auth_bind=yes we don't necessarily have a password.
 	   this will fail actual password credentials lookups, but it's fine
 	   for passdb lookups done by lmtp/doveadm */
-	require_password = !module->conn->set->auth_bind;
+	require_password = !module->conn->set->passdb_ldap_bind;
         ldap_lookup_pass(request, ldap_request, require_password);
 }
 
@@ -465,7 +465,7 @@ static int passdb_ldap_preinit(pool_t pool, struct event *event,
 	p_array_init(&conn->pass_attr_map, pool, 16);
 	db_ldap_set_attrs(conn, conn->set->pass_attrs, &conn->pass_attr_names,
 			  &conn->pass_attr_map,
-			  conn->set->auth_bind ? "password" : NULL);
+			  conn->set->passdb_ldap_bind ? "password" : NULL);
 	module->module.default_cache_key =
 		auth_cache_parse_key(pool,
 				     t_strconcat(conn->set->base,