global: Replace most master_service_settings_get_others() calls with master_service_s...

diff --git a/src/dict/dict-expire.c b/src/dict/dict-expire.c
index 3c08e0616562af144750b34863bba5484f83e48e..3f99b6d1793f5600e0f477726bab26fe258d1ad1 100644 (file)
--- 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 96716f7ed325485357dcd58c1dc6a099653e94c3..de502cd204d638aad4c4960634ac68c8e233686f 100644 (file)
--- 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 cee96725fbcd7741b38c85e2568546a3df808bdf..37dbb067444344c1211422af2cd350a462db0b13 100644 (file)
--- 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 b07902463566a204f340519ef02a4ec8a9763798..45468dab269d628eeaa3d77846828a445c46f97e 100644 (file)
--- 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 0b6b7875263701e410e96e61a39aa085566f03f9..6b17fa42b94be304bb7a90a6716349ea476ebc1e 100644 (file)
--- 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 3c8c167b0acb227910708b3e4b3af2cb61cfa85d..6a2221cbd1e494d5e8f4c5d020b1bdafd51f1a73 100644 (file)
--- 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 79e828219e796b641da2902fdef066ede567f2c9..e0f8fc5c4726f53873be85bc94835c1cc79bd117 100644 (file)
--- 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 24a187f8dc7b2e122ab4721da32df981e7465f40..6c95510aaf4b46c14460f9bc271106be14687d8a 100644 (file)
--- 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 101e508d61c8145dd1bd9353b8f7ee4769374532..794b1026af247612d77c9be420522eafae8e1ee0 100644 (file)
--- 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 32b87d05085df6f603e8c2f858e5506f7c987ea8..4069b3e952157c02a363e6ccb983bf1e4b51a9a7 100644 (file)
--- 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,
+                               &quota_status_setting_parser_info);
 
        quota_status_settings = settings_dup(&quota_status_setting_parser_info, set,
                                             quota_status_pool);

diff --git a/src/replication/aggregator/aggregator.c b/src/replication/aggregator/aggregator.c
index 8e213bfc6f27baea842747aac6680341dc623958..f251f7edc1142552a5af1fca8561290378d8195c 100644 (file)
--- 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 360093454c43443065fa77fcc0b4a46606da3b20..c85b37662067c81de008dfeec59e3c93f38c53c0 100644 (file)
--- 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 15e07338fa8e25f6e33f788430a342657e90a07b..f63c3fd15b5e0dcd182f8cee1a62b8a8dca6f60a 100644 (file)
--- 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);