lib-master, global: Remove master_service_settings_input.{module|extra_modules}

Configuration reading now reads all the modules always.

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index ca840f3ec192b2955ad33c5f8219531ecc0322a6..973aae10382a0de6b1fae888d89b37d27febb95c 100644 (file)
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -566,7 +566,6 @@ auth_settings_read(const char *service, pool_t pool,
 
        i_zero(&input);
        input.roots = set_roots;
-       input.module = "auth";
        input.service = service;
        if (master_service_settings_read(master_service, &input,
                                         output_r, &error) < 0)

diff --git a/src/dict/dict-expire.c b/src/dict/dict-expire.c
index 3f99b6d1793f5600e0f477726bab26fe258d1ad1..58766e91154a2e6691b23c26789e744501bafe3b 100644 (file)
--- a/src/dict/dict-expire.c
+++ b/src/dict/dict-expire.c
@@ -156,7 +156,6 @@ int main(int argc, char *argv[])
 
        const struct master_service_settings_input set_input = {
                .roots = set_roots,
-               .module = "dict",
        };
        struct master_service_settings_output output;
        if (master_service_settings_read(master_service, &set_input,

diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c
index a4b2a963b69c32d48b36bee144903082abf94883..2d76e1def7cdcef1520111e211594705c045c2e9 100644 (file)
--- a/src/doveadm/doveadm-settings.c
+++ b/src/doveadm/doveadm-settings.c
@@ -242,25 +242,18 @@ void doveadm_read_settings(void)
        const struct doveadm_settings *set;
        struct doveadm_setting_root *root;
        ARRAY(const struct setting_parser_info *) set_roots;
-       ARRAY_TYPE(const_string) module_names;
        const char *error;
 
        t_array_init(&set_roots, N_ELEMENTS(default_set_roots) +
                     array_count(&doveadm_setting_roots) + 1);
        array_append(&set_roots, default_set_roots,
                     N_ELEMENTS(default_set_roots));
-       t_array_init(&module_names, 4);
-       array_foreach_modifiable(&doveadm_setting_roots, root) {
-               array_push_back(&module_names, &root->info->module_name);
+       array_foreach_modifiable(&doveadm_setting_roots, root)
                array_push_back(&set_roots, &root->info);
-       }
-       array_append_zero(&module_names);
        array_append_zero(&set_roots);
 
        i_zero(&input);
        input.roots = array_front(&set_roots);
-       input.module = "doveadm";
-       input.extra_modules = array_front(&module_names);
        input.service = "doveadm";
        input.preserve_user = TRUE;
        input.preserve_home = TRUE;

diff --git a/src/imap-urlauth/imap-urlauth.c b/src/imap-urlauth/imap-urlauth.c
index 45468dab269d628eeaa3d77846828a445c46f97e..f2d689479c32fc6d26b02ad9975a059174f86ec2 100644 (file)
--- a/src/imap-urlauth/imap-urlauth.c
+++ b/src/imap-urlauth/imap-urlauth.c
@@ -254,7 +254,6 @@ int main(int argc, char *argv[])
 
        i_zero(&input);
        input.roots = set_roots;
-       input.module = "imap-urlauth";
        input.service = "imap-urlauth";
        if (master_service_settings_read(master_service, &input, &output,
                                                &error) < 0)

diff --git a/src/indexer/indexer-worker.c b/src/indexer/indexer-worker.c
index ef39aebb2f70282cfdf0792fc2c6c6c7c08698c8..43c5e87cbdfbe38e1d73990f5a72909dff078493 100644 (file)
--- a/src/indexer/indexer-worker.c
+++ b/src/indexer/indexer-worker.c
@@ -34,7 +34,6 @@ static void drop_privileges(void)
                struct master_service_settings_output output;
 
                i_zero(&input);
-               input.module = "mail";
                input.service = "indexer-worker";
                (void)master_service_settings_read(master_service,
                                                   &input, &output, &error);

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index 79fe13828826d45c038b8d131a662d9f7c560b1e..b7357ab480279fa8217031f6a3d67fef85d005d7 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -661,7 +661,6 @@ int master_service_settings_read_simple(struct master_service *service,
 
        i_zero(&input);
        input.roots = roots;
-       input.module = service->name;
        return master_service_settings_read(service, &input, &output, error_r);
 }
 

diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h
index c436a9228915b75d8d73c97131434deb0cf0df52..846085d3304649c3b46d41f7a90d5a65ce0664db 100644 (file)
--- a/src/lib-master/master-service-settings.h
+++ b/src/lib-master/master-service-settings.h
@@ -42,10 +42,6 @@ struct master_service_settings_input {
        bool always_exec;
        bool use_sysexits;
 
-       /* Either/both module and extra_modules can be set. Usually just one
-          is needed, so module is simpler to set. */
-       const char *module;
-       const char *const *extra_modules;
        const char *service;
        const char *username;
        struct ip_addr local_ip, remote_ip;

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 0987618b1ffd0703c18bc4414e41630ededdfd9f..5e831ad6484117a16baff22f7cd34e541884c029 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1090,7 +1090,6 @@ int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx,
                (flags & MAIL_STORAGE_SERVICE_FLAG_USE_SYSEXITS) != 0;
 
        if (input != NULL) {
-               set_input.module = input->module;
                set_input.service = input->service;
                set_input.username = input->username;
                set_input.local_ip = input->local_ip;

diff --git a/src/lmtp/main.c b/src/lmtp/main.c
index fb9ada8f060509e15d3942003bb2ba875021c22a..f24eb92a7fa35808dfe9eb3240c688c8c20d71db 100644 (file)
--- a/src/lmtp/main.c
+++ b/src/lmtp/main.c
@@ -68,7 +68,6 @@ static void drop_privileges(void)
        struct master_service_settings_output output;
 
        i_zero(&input);
-       input.module = "lmtp";
        input.service = "lmtp";
        if (master_service_settings_read(master_service,
                                         &input, &output, &error) < 0)

diff --git a/src/login-common/login-settings.c b/src/login-common/login-settings.c
index a4ad808c0845154f4bd4be181393417d7ddd491c..eae7b464ae491fdedf9e52620b15199ab691e2bf 100644 (file)
--- a/src/login-common/login-settings.c
+++ b/src/login-common/login-settings.c
@@ -173,7 +173,6 @@ login_settings_read(pool_t pool,
 
        i_zero(&input);
        input.roots = login_set_roots;
-       input.module = login_binary->process_name;
        input.service = login_binary->protocol;
        input.local_name = local_name;
 

diff --git a/src/master/main.c b/src/master/main.c
index 5ab9ce5b2ab22df161e6b5f2da184565b7951d1c..116bce0dc2a17b88707c7b95724d7e64b97f3209 100644 (file)
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -417,7 +417,6 @@ sig_settings_reload(const siginfo_t *si ATTR_UNUSED,
 
        i_zero(&input);
        input.roots = set_roots;
-       input.module = MASTER_SERVICE_NAME;
        input.config_path = services_get_config_socket_path(services);
        input.never_exec = TRUE;
        if (master_service_settings_read(master_service, &input,
@@ -498,7 +497,6 @@ static struct master_settings *master_settings_read(void)
 
        i_zero(&input);
        input.roots = set_roots;
-       input.module = "master";
        input.preserve_environment = TRUE;
        input.always_exec = TRUE;
        if (master_service_settings_read(master_service, &input, &output,

diff --git a/src/plugins/mail-crypt/mail-crypt-pluginenv.c b/src/plugins/mail-crypt/mail-crypt-pluginenv.c
index 794b1026af247612d77c9be420522eafae8e1ee0..f3ce7274c9c9aa1582ceb7a4d9f917c26a4a6374 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-pluginenv.c
+++ b/src/plugins/mail-crypt/mail-crypt-pluginenv.c
@@ -22,7 +22,6 @@ fs_crypt_load_settings(void)
 
        i_zero(&input);
        input.roots = set_roots;
-       input.module = "fs-crypt";
        input.service = "fs-crypt";
        if (master_service_settings_read(master_service, &input,
                                         &output, &error) < 0)