From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sun, 27 Feb 2022 21:29:57 +0000 (+0100)
Subject: lib-master, global: master_service_settings_cache_read() - Remove dyn_parsers parameter
X-Git-Tag: 2.4.0~3329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1f71b85f3179f5237bdaf7beca6e904580ce3c4;p=thirdparty%2Fdovecot%2Fcore.git

lib-master, global: master_service_settings_cache_read() - Remove dyn_parsers parameter
---

diff --git a/src/lib-master/master-service-settings-cache.c b/src/lib-master/master-service-settings-cache.c
index 109d450c84..ec5843f556 100644
--- a/src/lib-master/master-service-settings-cache.c
+++ b/src/lib-master/master-service-settings-cache.c
@@ -358,7 +358,6 @@ cache_add(struct master_service_settings_cache *cache,
 
 int master_service_settings_cache_read(struct master_service_settings_cache *cache,
 				       const struct master_service_settings_input *input,
-				       const struct dynamic_settings_parser *dyn_parsers,
 				       const struct setting_parser_context **parser_r,
 				       const char **error_r)
 {
@@ -379,10 +378,6 @@ int master_service_settings_cache_read(struct master_service_settings_cache *cac
 			return 0;
 	}
 
-	if (dyn_parsers != NULL) {
-		settings_parser_dyn_update(cache->pool, &new_input.roots,
-					   dyn_parsers);
-	}
 	if (master_service_settings_read(cache->service, &new_input,
 					 &output, error_r) < 0)
 		return -1;
diff --git a/src/lib-master/master-service-settings-cache.h b/src/lib-master/master-service-settings-cache.h
index 157132e639..238fa636d5 100644
--- a/src/lib-master/master-service-settings-cache.h
+++ b/src/lib-master/master-service-settings-cache.h
@@ -9,7 +9,6 @@ void master_service_settings_cache_deinit(struct master_service_settings_cache *
 int master_service_settings_cache_init_filter(struct master_service_settings_cache *cache);
 int master_service_settings_cache_read(struct master_service_settings_cache *cache,
 				       const struct master_service_settings_input *input,
-				       const struct dynamic_settings_parser *dyn_parsers,
 				       const struct setting_parser_context **parser_r,
 				       const char **error_r) ATTR_NULL(3);
 
diff --git a/src/lib-master/test-master-service-settings-cache.c b/src/lib-master/test-master-service-settings-cache.c
index 1765839168..509cee8d64 100644
--- a/src/lib-master/test-master-service-settings-cache.c
+++ b/src/lib-master/test-master-service-settings-cache.c
@@ -82,7 +82,7 @@ static void test_master_service_settings_cache_once(void)
 		input.remote_ip.family = AF_INET;
 		input.remote_ip.u.ip4.s_addr = i_rand_minmax(100, 199);
 	}
-	test_assert(master_service_settings_cache_read(cache, &input, NULL, &parser, &error) == 0);
+	test_assert(master_service_settings_cache_read(cache, &input, &parser, &error) == 0);
 }
 
 static void test_master_service_settings_cache(void)
diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 01800477f8..9e0e3b151d 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1111,7 +1111,7 @@ int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx,
 	    null_strcmp(set_input.service, ctx->set_cache_service) == 0 &&
 	    ctx->set_cache != NULL) {
 		if (master_service_settings_cache_read(ctx->set_cache,
-						       &set_input, NULL,
+						       &set_input,
 						       parser_r, error_r) < 0) {
 			*error_r = t_strdup_printf(
 				"Error reading configuration: %s", *error_r);
diff --git a/src/login-common/login-settings.c b/src/login-common/login-settings.c
index 904ab606af..905bac67d4 100644
--- a/src/login-common/login-settings.c
+++ b/src/login-common/login-settings.c
@@ -198,7 +198,7 @@ login_settings_read(pool_t pool,
 			master_service_settings_cache_init_filter(set_cache);
 	}
 
-	if (master_service_settings_cache_read(set_cache, &input, NULL,
+	if (master_service_settings_cache_read(set_cache, &input,
 					       &parser, &error) < 0)
 		i_fatal("Error reading configuration: %s", error);