From: Timo Sirainen Date: Tue, 29 Nov 2022 23:00:31 +0000 (+0200) Subject: lib-master, global: Remove master_service_settings_input.{module|extra_modules} X-Git-Tag: 2.4.0~3076 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ebf7f81a7ac72b7107a59afa5173e89d6061da5;p=thirdparty%2Fdovecot%2Fcore.git 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 ca840f3ec1..973aae1038 100644 --- 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 3f99b6d179..58766e9115 100644 --- 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 a4b2a963b6..2d76e1def7 100644 --- 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 45468dab26..f2d689479c 100644 --- 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 ef39aebb2f..43c5e87cbd 100644 --- 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 79fe138288..b7357ab480 100644 --- 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 c436a92289..846085d330 100644 --- 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 0987618b1f..5e831ad648 100644 --- 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 fb9ada8f06..f24eb92a7f 100644 --- 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 a4ad808c08..eae7b464ae 100644 --- 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 5ab9ce5b2a..116bce0dc2 100644 --- 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 794b1026af..f3ce7274c9 100644 --- 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)