global: Replace NULL event for settings_get*() with master_service.event

diff --git a/src/auth/auth-policy.c b/src/auth/auth-policy.c
index 193e12d014c9b3cc8464aa937c47b601627b8e3e..62ef8a558b9182cfd4a2cb5fb40f847498f3c2d1 100644 (file)
--- a/src/auth/auth-policy.c
+++ b/src/auth/auth-policy.c
@@ -155,7 +155,7 @@ auth_policy_open_and_close_to_key(struct json_ostream *json_output,
 void auth_policy_init(void)
 {
        const struct master_service_ssl_settings *master_ssl_set =
-               settings_get_or_fatal(NULL,
+               settings_get_or_fatal(master_service_get_event(master_service),
                        &master_service_ssl_setting_parser_info);
        struct ssl_iostream_settings ssl_set;
        i_zero(&ssl_set);

diff --git a/src/dict/dict-expire.c b/src/dict/dict-expire.c
index b7748004005625f4021be3e9bf9939037994f0dd..eab24372914783f367908a322549188e0e492661 100644 (file)
--- a/src/dict/dict-expire.c
+++ b/src/dict/dict-expire.c
@@ -106,7 +106,9 @@ static void main_init(void)
 {
        struct module_dir_load_settings mod_set;
 
-       dict_settings = settings_get_or_fatal(NULL, &dict_setting_parser_info);
+       dict_settings =
+               settings_get_or_fatal(master_service_get_event(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 ae0d4f47a1806fb22d1b88a4c4098a1d841aea5e..c49a50b18555d83c6bee7768131b7559b9bd36d1 100644 (file)
--- a/src/dict/main.c
+++ b/src/dict/main.c
@@ -102,7 +102,9 @@ static void main_init(void)
 {
        struct module_dir_load_settings mod_set;
 
-       dict_settings = settings_get_or_fatal(NULL, &dict_setting_parser_info);
+       dict_settings =
+               settings_get_or_fatal(master_service_get_event(master_service),
+                                     &dict_setting_parser_info);
 
        i_zero(&mod_set);
        mod_set.abi_version = DOVECOT_ABI_VERSION;

diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c
index b880dd1fccf68e759fd0eb689fb1fc1e673d6bd3..5368a83183102a52588dfcd89742cac348923857 100644 (file)
--- a/src/doveadm/doveadm-settings.c
+++ b/src/doveadm/doveadm-settings.c
@@ -238,9 +238,11 @@ void doveadm_read_settings(void)
        doveadm_verbose_proctitle = master_service_get_service_settings(master_service)->verbose_proctitle;
 
        doveadm_settings =
-               settings_get_or_fatal(NULL, &doveadm_setting_parser_info);
+               settings_get_or_fatal(master_service_get_event(master_service),
+                                     &doveadm_setting_parser_info);
        doveadm_ssl_set =
-               settings_get_or_fatal(NULL, &master_service_ssl_setting_parser_info);
+               settings_get_or_fatal(master_service_get_event(master_service),
+                                     &master_service_ssl_setting_parser_info);
 }
 
 int doveadm_settings_get_config_fd(void)

diff --git a/src/imap-urlauth/imap-urlauth.c b/src/imap-urlauth/imap-urlauth.c
index 564c3e7418990933561b26f2dd3d7dca60f2516e..48093818d4750ef4da8824a0e12106f7b5cfd522 100644 (file)
--- a/src/imap-urlauth/imap-urlauth.c
+++ b/src/imap-urlauth/imap-urlauth.c
@@ -250,7 +250,8 @@ int main(int argc, char *argv[])
                i_fatal("%s", error);
 
        imap_urlauth_settings = 
-               settings_get_or_fatal(NULL, &imap_urlauth_setting_parser_info);
+               settings_get_or_fatal(master_service_get_event(master_service),
+                                     &imap_urlauth_setting_parser_info);
 
        if (imap_urlauth_settings->verbose_proctitle)
                verbose_proctitle = TRUE;

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 697c08e870e6fc07a526c0caf4b71b97f1831bb9..46d4fa6982a9d44952d0de3b974f24caa2036834 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1450,7 +1450,8 @@ void mail_storage_service_init_settings(struct mail_storage_service_ctx *ctx,
        if (ctx->conn != NULL)
                return;
 
-       struct event *event = input == NULL ? NULL : input->event_parent;
+       struct event *event = input != NULL && input->event_parent != NULL ?
+               input->event_parent : master_service_get_event(ctx->service);
        if (settings_get(event, &mail_user_setting_parser_info,
                         SETTINGS_GET_FLAG_NO_EXPAND, &user_set, &error) < 0)
                i_fatal("%s", error);

diff --git a/src/login-common/main.c b/src/login-common/main.c
index a2172bd2cd3895e2fff947f44f926f451304fe7b..eb45fc9ecc30b86b43718ea1dcde6377408a3d2f 100644 (file)
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -505,13 +505,16 @@ int login_binary_run(struct login_binary *binary,
        struct master_service_settings_output output;
        if (master_service_settings_read(master_service, &input,
                                         &output, &error) < 0 ||
-           settings_get(NULL, &login_setting_parser_info,
+           settings_get(master_service_get_event(master_service),
+                        &login_setting_parser_info,
                         SETTINGS_GET_FLAG_NO_EXPAND,
                         &global_login_settings, &error) < 0)
                i_fatal("%s", error);
-       global_ssl_settings = settings_get_or_fatal(NULL,
+       global_ssl_settings = settings_get_or_fatal(
+               master_service_get_event(master_service),
                &master_service_ssl_setting_parser_info);
-       global_ssl_server_settings = settings_get_or_fatal(NULL,
+       global_ssl_server_settings = settings_get_or_fatal(
+               master_service_get_event(master_service),
                &master_service_ssl_server_setting_parser_info);
 
        if (argv[optind] != NULL)

diff --git a/src/master/main.c b/src/master/main.c
index 8cc0e0328a9df214fd12fe51413f8a31eedf8cfb..bf5e47ba2108ef1a7512115cd5a827a4704ded15 100644 (file)
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -422,7 +422,8 @@ sig_settings_reload(const siginfo_t *si ATTR_UNUSED,
                i_sd_notify(0, "READY=1");
                return;
        }
-       if (settings_get(NULL, &master_setting_parser_info, 0,
+       if (settings_get(master_service_get_event(master_service),
+                        &master_setting_parser_info, 0,
                         &set, &error) < 0) {
                i_close_fd(&output.config_fd);
                i_error("%s", error);
@@ -514,7 +515,8 @@ static const struct master_settings *master_settings_read(void)
                i_fatal("%s", error);
        global_config_fd = output.config_fd;
        fd_close_on_exec(global_config_fd, TRUE);
-       return settings_get_or_fatal(NULL, &master_setting_parser_info);
+       return settings_get_or_fatal(master_service_get_event(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 f6a39062de47688ce09435afa35d2ad5741289f8..98301b34bc22345153792d95dbecfa9591ac4fb3 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-pluginenv.c
+++ b/src/plugins/mail-crypt/mail-crypt-pluginenv.c
@@ -62,7 +62,8 @@ int mail_crypt_global_keys_load_pluginenv(const char *set_prefix,
                                const char **error_r)
 {
        const struct fs_crypt_settings *set =
-               settings_get_or_fatal(NULL, &fs_crypt_setting_parser_info);
+               settings_get_or_fatal(master_service_get_event(master_service),
+                                     &fs_crypt_setting_parser_info);
 
        const char *set_key = t_strconcat(set_prefix, "_public_key", NULL);
        const char *key_data = mail_crypt_plugin_getenv(set, set_key);

diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c
index bec4f5f883cecaf5a266a98d8db095eb46cae01e..4437d3dd081f3c0140eb8576b4284b1b28cea969 100644 (file)
--- a/src/plugins/quota/quota-status.c
+++ b/src/plugins/quota/quota-status.c
@@ -305,10 +305,12 @@ static void main_init(void)
        input.service = "quota-status";
        input.username = "";
 
-       if (settings_get(NULL, &mail_storage_setting_parser_info,
+       if (settings_get(master_service_get_event(master_service),
+                        &mail_storage_setting_parser_info,
                         SETTINGS_GET_FLAG_NO_EXPAND, &mail_set, &error) < 0)
                i_fatal("%s", error);
-       quota_status_settings = settings_get_or_fatal(NULL,
+       quota_status_settings = settings_get_or_fatal(
+               master_service_get_event(master_service),
                &quota_status_setting_parser_info);
 
        value = mail_user_set_plugin_getenv(mail_set, "quota_status_nouser");

diff --git a/src/stats/main.c b/src/stats/main.c
index 5c1b8e3e59872d4ae7bb6281d965de9e6f9ac3db..98db4e8ef5205501fceab6133225a6308b8dced9 100644 (file)
--- a/src/stats/main.c
+++ b/src/stats/main.c
@@ -47,9 +47,11 @@ static void main_preinit(void)
 static void main_init(void)
 {
        stats_settings =
-               settings_get_or_fatal(NULL, &stats_setting_parser_info);
+               settings_get_or_fatal(master_service_get_event(master_service),
+                                     &stats_setting_parser_info);
        master_ssl_set =
-               settings_get_or_fatal(NULL, &master_service_ssl_setting_parser_info);
+               settings_get_or_fatal(master_service_get_event(master_service),
+                                     &master_service_ssl_setting_parser_info);
 
        stats_startup_time = ioloop_time;
        stats_metrics = stats_metrics_init(stats_settings);