global: Get settings via settings parser where possible

This will be required in the later commits.

diff --git a/src/imap-urlauth/imap-urlauth-worker.c b/src/imap-urlauth/imap-urlauth-worker.c
index 701cefd78aa96ffc97ce0379d25f74a4c51eb395..5124fe2f4dc59ee388b179fb9ebc20b3562dc363 100644 (file)
--- a/src/imap-urlauth/imap-urlauth-worker.c
+++ b/src/imap-urlauth/imap-urlauth-worker.c
@@ -588,7 +588,7 @@ client_handle_user_command(struct client *client, const char *cmd,
        /* drop privileges */
        restrict_access_allow_coredumps(TRUE);
 
-       set = mail_storage_service_user_get_set(user,
+       set = settings_parser_get_root_set(mail_user->set_parser,
                        &imap_urlauth_worker_setting_parser_info);
        if (mail_user_var_expand(mail_user, &imap_urlauth_worker_setting_parser_info,
                                 set, &error) <= 0) {

diff --git a/src/imap/main.c b/src/imap/main.c
index da50d7db0d3e317ac04fc9965403240df0df3a9f..3086b7096d763f16c70337e68c2ba45d860cf32b 100644 (file)
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -278,9 +278,9 @@ int client_create_from_input(const struct mail_storage_service_input *input,
 
        restrict_access_allow_coredumps(TRUE);
 
-       smtp_set = mail_storage_service_user_get_set(user,
+       smtp_set = settings_parser_get_root_set(mail_user->set_parser,
                        &smtp_submit_setting_parser_info);
-       imap_set = mail_storage_service_user_get_set(user,
+       imap_set = settings_parser_get_root_set(mail_user->set_parser,
                        &imap_setting_parser_info);
        if (imap_set->verbose_proctitle)
                verbose_proctitle = TRUE;

diff --git a/src/lda/main.c b/src/lda/main.c
index 9a1755ade2b3314e17c2008846d86fc77d37d8a6..5e76acc5d4ccd5189cd6a351968297f60ea54303 100644 (file)
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -283,7 +283,6 @@ lda_do_deliver(struct mail_deliver_context *ctx, bool stderr_rejection)
 
 static int
 lda_deliver(struct mail_deliver_input *dinput,
-           struct mail_storage_service_user *service_user,
            const char *user, const char *path,
            struct smtp_address *rcpt_to, const char *rcpt_to_source,
            bool stderr_rejection)
@@ -294,10 +293,10 @@ lda_deliver(struct mail_deliver_input *dinput,
        const char *errstr;
        int ret;
 
-       smtp_set = mail_storage_service_user_get_set(service_user,
-                       &smtp_submit_setting_parser_info);
-       lda_set = mail_storage_service_user_get_set(service_user,
-                       &lda_setting_parser_info);
+       lda_set = settings_parser_get_root_set(dinput->rcpt_user->set_parser,
+                                                  &lda_setting_parser_info);
+       smtp_set = settings_parser_get_root_set(dinput->rcpt_user->set_parser,
+                                               &smtp_submit_setting_parser_info);
        ret = mail_user_var_expand(dinput->rcpt_user, &lda_setting_parser_info,
                                   lda_set, &errstr);
        if (ret > 0) {
@@ -572,7 +571,7 @@ int main(int argc, char *argv[])
                                mail_from_error);
                }
 
-               ret = lda_deliver(&dinput, service_user, user, path,
+               ret = lda_deliver(&dinput, user, path,
                                  rcpt_to, rcpt_to_source, stderr_rejection);
 
                struct mailbox_transaction_context *t =

diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index d2d0c8bc8857fe8391bf567af25960c4448ef9bc..ca3c5e57275a9e4f737d94d7ed4743063bb9b152 100644 (file)
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -468,9 +468,9 @@ lmtp_local_deliver(struct lmtp_local *local,
        }
        local->rcpt_user = rcpt_user;
 
-       smtp_set = mail_storage_service_user_get_set(service_user,
+       smtp_set = settings_parser_get_root_set(rcpt_user->set_parser,
                        &smtp_submit_setting_parser_info);
-       lda_set = mail_storage_service_user_get_set(service_user,
+       lda_set = settings_parser_get_root_set(rcpt_user->set_parser,
                        &lda_setting_parser_info);
        ret = mail_user_var_expand(rcpt_user, &smtp_submit_setting_parser_info,
                                   smtp_set, &error);

diff --git a/src/pop3/main.c b/src/pop3/main.c
index 8592fd3ed878d044b6273e09fb6cbde3e1aa7839..56ff1862623d0c813c258dfba2c2c98793d2be63 100644 (file)
--- a/src/pop3/main.c
+++ b/src/pop3/main.c
@@ -148,7 +148,7 @@ client_create_from_input(const struct mail_storage_service_input *input,
        }
        restrict_access_allow_coredumps(TRUE);
 
-       set = mail_storage_service_user_get_set(user,
+       set = settings_parser_get_root_set(mail_user->set_parser,
                        &pop3_setting_parser_info);
        if (set->verbose_proctitle)
                verbose_proctitle = TRUE;

diff --git a/src/submission/main.c b/src/submission/main.c
index 54f4b6f5d1f78c376901b12f32d1daaf84fea6be..9426c92d711a929390eeaced39737619da9a99e5 100644 (file)
--- a/src/submission/main.c
+++ b/src/submission/main.c
@@ -192,7 +192,7 @@ client_create_from_input(const struct mail_storage_service_input *input,
 
        restrict_access_allow_coredumps(TRUE);
 
-       set = mail_storage_service_user_get_set(user,
+       set = settings_parser_get_root_set(mail_user->set_parser,
                        &submission_setting_parser_info);
        if (set->verbose_proctitle)
                verbose_proctitle = TRUE;