From 3670022644ff7d5615ef0a3560db2a767c8c4c00 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sat, 26 Feb 2022 22:44:37 +0100 Subject: [PATCH] global: Replace most master_service_settings_get_others() calls with master_service_settings_get_root_set() --- src/dict/dict-expire.c | 5 ++--- src/dict/main.c | 5 ++--- src/doveadm/client-connection.c | 3 ++- src/imap-urlauth/imap-urlauth.c | 6 +++--- src/lda/main.c | 7 ++++--- src/lib-lua/dlua-dovecot-http.c | 4 +++- src/lmtp/lmtp-client.c | 7 ++++--- src/master/main.c | 8 ++++---- src/plugins/mail-crypt/mail-crypt-pluginenv.c | 3 ++- src/plugins/quota/quota-status.c | 3 ++- src/replication/aggregator/aggregator.c | 5 ++--- src/replication/replicator/replicator.c | 6 ++---- src/stats/main.c | 4 ++-- 13 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/dict/dict-expire.c b/src/dict/dict-expire.c index 3c08e06165..3f99b6d179 100644 --- a/src/dict/dict-expire.c +++ b/src/dict/dict-expire.c @@ -105,10 +105,9 @@ static void main_preinit(void) static void main_init(void) { struct module_dir_load_settings mod_set; - void **sets; - sets = master_service_settings_get_others(master_service); - dict_settings = sets[0]; + dict_settings = master_service_settings_get_root_set(master_service, + &dict_setting_parser_info); i_zero(&mod_set); mod_set.abi_version = DOVECOT_ABI_VERSION; diff --git a/src/dict/main.c b/src/dict/main.c index 96716f7ed3..de502cd204 100644 --- a/src/dict/main.c +++ b/src/dict/main.c @@ -101,10 +101,9 @@ static void main_preinit(void) static void main_init(void) { struct module_dir_load_settings mod_set; - void **sets; - sets = master_service_settings_get_others(master_service); - dict_settings = sets[0]; + dict_settings = master_service_settings_get_root_set(master_service, + &dict_setting_parser_info); i_zero(&mod_set); mod_set.abi_version = DOVECOT_ABI_VERSION; diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c index cee96725fb..37dbb06744 100644 --- a/src/doveadm/client-connection.c +++ b/src/doveadm/client-connection.c @@ -52,7 +52,8 @@ static int client_connection_read_settings(struct client_connection *conn) e_error(conn->event, "Error reading configuration: %s", error); return -1; } - set = master_service_settings_get_others(master_service)[0]; + set = master_service_settings_get_root_set(master_service, + &doveadm_setting_parser_info); conn->set = settings_dup(&doveadm_setting_parser_info, set, conn->pool); return 0; } diff --git a/src/imap-urlauth/imap-urlauth.c b/src/imap-urlauth/imap-urlauth.c index b079024635..45468dab26 100644 --- a/src/imap-urlauth/imap-urlauth.c +++ b/src/imap-urlauth/imap-urlauth.c @@ -216,7 +216,6 @@ int main(int argc, char *argv[]) struct login_server_settings login_set; struct master_service_settings_input input; struct master_service_settings_output output; - void **sets; enum master_service_flags service_flags = 0; const char *error = NULL, *username = NULL; const char *auth_socket_path = "auth-master"; @@ -261,8 +260,9 @@ int main(int argc, char *argv[]) &error) < 0) i_fatal("Error reading configuration: %s", error); - sets = master_service_settings_get_others(master_service); - imap_urlauth_settings = sets[0]; + imap_urlauth_settings = + master_service_settings_get_root_set(master_service, + &imap_urlauth_setting_parser_info); if (imap_urlauth_settings->verbose_proctitle) verbose_proctitle = TRUE; diff --git a/src/lda/main.c b/src/lda/main.c index 0b6b787526..6b17fa42b9 100644 --- a/src/lda/main.c +++ b/src/lda/main.c @@ -150,13 +150,14 @@ lda_raw_mail_open(struct mail_deliver_input *dinput, const char *path) struct mailbox_header_lookup_ctx *headers_ctx; const struct smtp_address *mail_from; struct istream *input; - void **sets; + const struct mail_user_settings *user_set; time_t mtime; int ret; - sets = master_service_settings_get_others(master_service); + user_set = master_service_settings_get_root_set(master_service, + &mail_user_setting_parser_info); raw_mail_user = raw_storage_create_from_set(dinput->rcpt_user->set_info, - sets[0]); + user_set); mail_from = (dinput->mail_from != NULL ? dinput->mail_from : &default_envelope_sender); diff --git a/src/lib-lua/dlua-dovecot-http.c b/src/lib-lua/dlua-dovecot-http.c index 3c8c167b0a..6a2221cbd1 100644 --- a/src/lib-lua/dlua-dovecot-http.c +++ b/src/lib-lua/dlua-dovecot-http.c @@ -10,6 +10,7 @@ #include "istream.h" #include "iostream-ssl.h" #include "master-service.h" +#include "master-service-settings.h" #include "master-service-ssl-settings.h" #define DLUA_DOVECOT_HTTP "http" @@ -487,7 +488,8 @@ static int dlua_http_client_new(lua_State *L) luaL_error(L, "Invalid HTTP client setting: %s", error); const struct master_service_ssl_settings *master_ssl_set = - master_service_ssl_settings_get(master_service); + master_service_settings_get_root_set(master_service, + &master_service_ssl_setting_parser_info); master_service_ssl_client_settings_to_iostream_set(master_ssl_set, pool_datastack_create(), &ssl_set); http_set.ssl = &ssl_set; diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c index 79e828219e..e0f8fc5c47 100644 --- a/src/lmtp/lmtp-client.c +++ b/src/lmtp/lmtp-client.c @@ -99,11 +99,12 @@ static void client_load_modules(struct client *client) static void client_raw_user_create(struct client *client) { - void **sets; + const struct mail_user_settings *user_set; - sets = master_service_settings_get_others(master_service); + user_set = master_service_settings_get_root_set(master_service, + &mail_user_setting_parser_info); client->raw_mail_user = - raw_storage_create_from_set(client->user_set_info, sets[0]); + raw_storage_create_from_set(client->user_set_info, user_set); } static void client_read_settings(struct client *client, bool ssl) diff --git a/src/master/main.c b/src/master/main.c index 24a187f8dc..6c95510aaf 100644 --- a/src/master/main.c +++ b/src/master/main.c @@ -374,7 +374,6 @@ sig_settings_reload(const siginfo_t *si ATTR_UNUSED, struct master_service_settings_input input; struct master_service_settings_output output; const struct master_settings *set; - void **sets; struct service_list *new_services; struct service *service; const char *error; @@ -405,8 +404,8 @@ sig_settings_reload(const siginfo_t *si ATTR_UNUSED, i_sd_notify(0, "READY=1"); return; } - sets = master_service_settings_get_others(master_service); - set = sets[0]; + set = master_service_settings_get_root_set(master_service, + &master_setting_parser_info); if (services_create(set, &new_services, &error) < 0) { /* new configuration is invalid, keep the old */ @@ -483,7 +482,8 @@ static struct master_settings *master_settings_read(void) if (master_service_settings_read(master_service, &input, &output, &error) < 0) i_fatal("Error reading configuration: %s", error); - return master_service_settings_get_others(master_service)[0]; + return master_service_settings_get_root_set(master_service, + &master_setting_parser_info); } static void main_log_startup(char **protocols) diff --git a/src/plugins/mail-crypt/mail-crypt-pluginenv.c b/src/plugins/mail-crypt/mail-crypt-pluginenv.c index 101e508d61..794b1026af 100644 --- a/src/plugins/mail-crypt/mail-crypt-pluginenv.c +++ b/src/plugins/mail-crypt/mail-crypt-pluginenv.c @@ -28,7 +28,8 @@ fs_crypt_load_settings(void) &output, &error) < 0) i_fatal("Error reading configuration: %s", error); - return master_service_settings_get_others(master_service)[0]; + return master_service_settings_get_root_set(master_service, + &fs_crypt_setting_parser_info); } static diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c index 32b87d0508..4069b3e952 100644 --- a/src/plugins/quota/quota-status.c +++ b/src/plugins/quota/quota-status.c @@ -308,7 +308,8 @@ static void main_init(void) i_fatal("%s", error); user_set = settings_parser_get_root_set(set_parser, &mail_user_setting_parser_info); - set = master_service_settings_get_others(master_service)[1]; + set = master_service_settings_get_root_set(master_service, + "a_status_setting_parser_info); quota_status_settings = settings_dup("a_status_setting_parser_info, set, quota_status_pool); diff --git a/src/replication/aggregator/aggregator.c b/src/replication/aggregator/aggregator.c index 8e213bfc6f..f251f7edc1 100644 --- a/src/replication/aggregator/aggregator.c +++ b/src/replication/aggregator/aggregator.c @@ -32,11 +32,10 @@ static void main_preinit(void) struct ip_addr *ips; unsigned int ips_count; const struct aggregator_settings *set; - void **sets; int ret; - sets = master_service_settings_get_others(master_service); - set = sets[0]; + set = master_service_settings_get_root_set(master_service, + &aggregator_setting_parser_info); aggregator_event = event_create(NULL); event_add_category(aggregator_event, &event_category_replication); diff --git a/src/replication/replicator/replicator.c b/src/replication/replicator/replicator.c index 360093454c..c85b376620 100644 --- a/src/replication/replicator/replicator.c +++ b/src/replication/replicator/replicator.c @@ -54,11 +54,9 @@ replicator_dump_timeout(void *context ATTR_UNUSED) static void main_init(void) { - void **sets; - service_set = master_service_settings_get(master_service); - sets = master_service_settings_get_others(master_service); - set = sets[0]; + set = master_service_settings_get_root_set(master_service, + &replicator_setting_parser_info); queue = replicator_queue_init(set->replication_full_sync_interval, REPLICATOR_FAILURE_RESYNC_INTERVAL_SECS); diff --git a/src/stats/main.c b/src/stats/main.c index 15e07338fa..f63c3fd15b 100644 --- a/src/stats/main.c +++ b/src/stats/main.c @@ -61,8 +61,8 @@ static void main_preinit(void) static void main_init(void) { - void **sets = master_service_settings_get_others(master_service); - stats_settings = sets[0]; + stats_settings = master_service_settings_get_root_set(master_service, + &stats_setting_parser_info); stats_startup_time = ioloop_time; stats_metrics = stats_metrics_init(stats_settings); -- 2.47.3