From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Thu, 3 Oct 2024 09:43:06 +0000 (+0000)
Subject: dict-ldap: dict_ldap_settings - Rename maps into parsed_maps
X-Git-Tag: 2.4.0~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b885272d4c3dc92d3bc486912afe1e672eff466e;p=thirdparty%2Fdovecot%2Fcore.git

dict-ldap: dict_ldap_settings - Rename maps into parsed_maps
---

diff --git a/src/lib-dict-backend/dict-ldap-settings.c b/src/lib-dict-backend/dict-ldap-settings.c
index 7c9f0127df..e314ae91c9 100644
--- a/src/lib-dict-backend/dict-ldap-settings.c
+++ b/src/lib-dict-backend/dict-ldap-settings.c
@@ -167,7 +167,7 @@ static const char *dict_ldap_map_finish(struct setting_parser_ctx *ctx)
 		if (strchr(ctx->cur_map.pattern, '$') != NULL)
 			return "Missing attributes for pattern variables";
 	}
-	array_push_back(&ctx->set->maps, &ctx->cur_map);
+	array_push_back(&ctx->set->parsed_maps, &ctx->cur_map);
 	i_zero(&ctx->cur_map);
 	return NULL;
 }
@@ -289,7 +289,7 @@ dict_ldap_settings_read(pool_t pool, const char *path, const char **error_r)
 	ctx.pool = pool;
 	ctx.set = p_new(pool, struct dict_ldap_settings, 1);
 	t_array_init(&ctx.cur_attributes, 16);
-	p_array_init(&ctx.set->maps, pool, 8);
+	p_array_init(&ctx.set->parsed_maps, pool, 8);
 
 	ctx.set->timeout = 30; /* default timeout */
 	ctx.set->require_ssl = FALSE; /* try to start SSL */
diff --git a/src/lib-dict-backend/dict-ldap-settings.h b/src/lib-dict-backend/dict-ldap-settings.h
index 293a9a94df..399607af3e 100644
--- a/src/lib-dict-backend/dict-ldap-settings.h
+++ b/src/lib-dict-backend/dict-ldap-settings.h
@@ -26,7 +26,7 @@ struct dict_ldap_settings {
 	unsigned int debug;
 	bool require_ssl;
 	bool start_tls;
-	ARRAY(struct dict_ldap_map) maps;
+	ARRAY(struct dict_ldap_map) parsed_maps;
 };
 
 struct dict_ldap_settings *
diff --git a/src/lib-dict-backend/dict-ldap.c b/src/lib-dict-backend/dict-ldap.c
index 79210d7418..b65977220a 100644
--- a/src/lib-dict-backend/dict-ldap.c
+++ b/src/lib-dict-backend/dict-ldap.c
@@ -110,7 +110,7 @@ ldap_dict_find_map(struct ldap_dict *dict, const char *path,
 	unsigned int i, count;
 
 	t_array_init(values, 2);
-	maps = array_get(&dict->set->maps, &count);
+	maps = array_get(&dict->set->parsed_maps, &count);
 	for (i = 0; i < count; i++) {
 		if (dict_ldap_map_match(&maps[i], path, values))
 			return &maps[i];