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 109d450c84cfa8ebaef1783def2706a1b0f9c7d8..ec5843f5564927b7c36d477515c0aa7e29ebf8c6 100644 (file)
--- 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 157132e639b9cf69e79df8b0e18542bb015825c0..238fa636d564f10fd38ece4a623be0205b5f6b08 100644 (file)
--- 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 17658391683dda6c6fe7bc03c38dd5e0e6231719..509cee8d64174dbde3d21fdaae5b8cac33ee22f5 100644 (file)
--- 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 01800477f8582e083ffddc6f06b9de5e23ac9d56..9e0e3b151dd702d02f966fa5b3aa475f0f7fcc3a 100644 (file)
--- 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 904ab606aff2eb0fc0b1f9474dc7f0a70c765a2c..905bac67d4486205508500bff208b40a023151c9 100644 (file)
--- 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);