From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Wed, 11 Sep 2024 09:52:40 +0000 (+0000)
Subject: dict-ldap: dict_ldap_map_settings - Rename base_dn into base
X-Git-Tag: 2.4.0~154
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9db118b72a38c8865f38f408e5011a3fa45fa0d;p=thirdparty%2Fdovecot%2Fcore.git

dict-ldap: dict_ldap_map_settings - Rename base_dn into base
---

diff --git a/src/lib-dict-backend/dict-ldap-settings.c b/src/lib-dict-backend/dict-ldap-settings.c
index 51a7141c0c..31dcd3b89a 100644
--- a/src/lib-dict-backend/dict-ldap-settings.c
+++ b/src/lib-dict-backend/dict-ldap-settings.c
@@ -47,7 +47,7 @@ static const struct setting_def dict_ldap_map_setting_defs[] = {
 	DEF_STR(filter),
 	DEF_STR(username_attribute),
 	DEF_STR(value_attribute),
-	DEF_STR(base_dn),
+	DEF_STR(base),
 	DEF_STR(scope),
 	{ 0, NULL, 0 }
 };
diff --git a/src/lib-dict-backend/dict-ldap-settings.h b/src/lib-dict-backend/dict-ldap-settings.h
index 40574875a2..621d86fbbb 100644
--- a/src/lib-dict-backend/dict-ldap-settings.h
+++ b/src/lib-dict-backend/dict-ldap-settings.h
@@ -8,7 +8,7 @@ struct dict_ldap_map_settings {
 	const char *filter;
 	const char *username_attribute;
 	const char *value_attribute;
-	const char *base_dn;
+	const char *base;
 	const char *scope;
 	int scope_val;
 	unsigned int timeout;
diff --git a/src/lib-dict-backend/dict-ldap.c b/src/lib-dict-backend/dict-ldap.c
index a8772a26b8..621573b450 100644
--- a/src/lib-dict-backend/dict-ldap.c
+++ b/src/lib-dict-backend/dict-ldap.c
@@ -430,7 +430,7 @@ void ldap_dict_lookup_async(struct dict *dict,
 		attributes[0] = map->value_attribute;
 		/* build lookup */
 		i_zero(&input);
-		input.base_dn = map->base_dn;
+		input.base_dn = map->base;
 		input.scope = map->scope_val;
 		if (!ldap_dict_build_query(set, map, &values, strncmp(key, DICT_PATH_PRIVATE, strlen(DICT_PATH_PRIVATE))==0, query, &error)) {
 			op->res.error = error;