From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Thu, 12 Sep 2024 07:44:30 +0000 (+0000)
Subject: dict-ldap: dict_sql_map_settings - Drop max_pattern_fields_count
X-Git-Tag: 2.4.0~160
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a10cc0383aac71e7bf237f4301c47431a6fed1d3;p=thirdparty%2Fdovecot%2Fcore.git

dict-ldap: dict_sql_map_settings - Drop max_pattern_fields_count
---

diff --git a/src/lib-dict-backend/dict-sql-legacy-settings.c b/src/lib-dict-backend/dict-sql-legacy-settings.c
index bed784ddaa..ea5821d449 100644
--- a/src/lib-dict-backend/dict-sql-legacy-settings.c
+++ b/src/lib-dict-backend/dict-sql-legacy-settings.c
@@ -125,8 +125,6 @@ static const char *dict_sql_fields_map(struct setting_parser_ctx *ctx)
 		}
 	}
 
-	if (ctx->set->map_set.max_pattern_fields_count < count)
-		ctx->set->map_set.max_pattern_fields_count = count;
 	ctx->cur_map.pattern = p_strdup(ctx->pool, str_c(pattern));
 	return NULL;
 }
diff --git a/src/lib-dict-backend/dict-sql-settings.c b/src/lib-dict-backend/dict-sql-settings.c
index 2f6396e0e7..faa3b569c8 100644
--- a/src/lib-dict-backend/dict-sql-settings.c
+++ b/src/lib-dict-backend/dict-sql-settings.c
@@ -226,8 +226,6 @@ static int dict_sql_fields_map(struct event *event, pool_t pool,
 		}
 	}
 
-	if (set->max_pattern_fields_count < count)
-		set->max_pattern_fields_count = count;
 	map->pattern = p_strdup(pool, str_c(pattern));
 	return 0;
 }
diff --git a/src/lib-dict-backend/dict-sql-settings.h b/src/lib-dict-backend/dict-sql-settings.h
index 60191320bb..da7354b217 100644
--- a/src/lib-dict-backend/dict-sql-settings.h
+++ b/src/lib-dict-backend/dict-sql-settings.h
@@ -64,7 +64,6 @@ struct dict_map_settings {
 
 struct dict_sql_map_settings {
 	pool_t pool;
-	unsigned int max_pattern_fields_count;
 	ARRAY(struct dict_sql_map) maps;
 };
 
diff --git a/src/lib-dict-backend/dict-sql.c b/src/lib-dict-backend/dict-sql.c
index 7408397e9c..e84b442e8d 100644
--- a/src/lib-dict-backend/dict-sql.c
+++ b/src/lib-dict-backend/dict-sql.c
@@ -261,7 +261,7 @@ sql_dict_find_map(struct sql_dict *dict, const char *path,
 	unsigned int i, count;
 	size_t len;
 
-	t_array_init(pattern_values, dict->set->max_pattern_fields_count);
+	t_array_init(pattern_values, 2);
 	maps = array_get(&dict->set->maps, &count);
 	for (i = 0; i < count; i++) {
 		if (dict_sql_map_match(&maps[i], path, pattern_values,
@@ -718,7 +718,7 @@ sql_dict_iterate_find_next_map(struct sql_dict_iterate_context *ctx,
 	size_t pat_len, path_len;
 	bool recurse = (ctx->flags & DICT_ITERATE_FLAG_RECURSE) != 0;
 
-	t_array_init(pattern_values, dict->set->max_pattern_fields_count);
+	t_array_init(pattern_values, 2);
 	maps = array_get(&dict->set->maps, &count);
 	for (i = ctx->next_map_idx; i < count; i++) {
 		if (dict_sql_map_match(&maps[i], ctx->path,