From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Thu, 3 Oct 2024 09:32:51 +0000 (+0000)
Subject: dict-ldap: dict_ldap_settings - Drop max_attribute_count
X-Git-Tag: 2.4.0~158
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bba75789336e5d09d15dbdbc0dd87636ade0180f;p=thirdparty%2Fdovecot%2Fcore.git

dict-ldap: dict_ldap_settings - Drop max_attribute_count
---

diff --git a/src/lib-dict-backend/dict-ldap-settings.c b/src/lib-dict-backend/dict-ldap-settings.c
index 4f807a5bab..7c9f0127df 100644
--- a/src/lib-dict-backend/dict-ldap-settings.c
+++ b/src/lib-dict-backend/dict-ldap-settings.c
@@ -127,8 +127,6 @@ static const char *dict_ldap_attributes_map(struct setting_parser_ctx *ctx)
 		}
 	}
 
-	if (ctx->set->max_attribute_count < count)
-		ctx->set->max_attribute_count = count;
 	ctx->cur_map.pattern = p_strdup(ctx->pool, str_c(pattern));
 	return NULL;
 }
diff --git a/src/lib-dict-backend/dict-ldap-settings.h b/src/lib-dict-backend/dict-ldap-settings.h
index 0919ca9d6d..293a9a94df 100644
--- a/src/lib-dict-backend/dict-ldap-settings.h
+++ b/src/lib-dict-backend/dict-ldap-settings.h
@@ -24,7 +24,6 @@ struct dict_ldap_settings {
 	unsigned int timeout;
 	unsigned int max_idle_time;
 	unsigned int debug;
-	unsigned int max_attribute_count;
 	bool require_ssl;
 	bool start_tls;
 	ARRAY(struct dict_ldap_map) maps;
diff --git a/src/lib-dict-backend/dict-ldap.c b/src/lib-dict-backend/dict-ldap.c
index 81c8ce11f7..79210d7418 100644
--- a/src/lib-dict-backend/dict-ldap.c
+++ b/src/lib-dict-backend/dict-ldap.c
@@ -109,7 +109,7 @@ ldap_dict_find_map(struct ldap_dict *dict, const char *path,
 	const struct dict_ldap_map *maps;
 	unsigned int i, count;
 
-	t_array_init(values, dict->set->max_attribute_count);
+	t_array_init(values, 2);
 	maps = array_get(&dict->set->maps, &count);
 	for (i = 0; i < count; i++) {
 		if (dict_ldap_map_match(&maps[i], path, values))