imap, pop3, submission, imap-urlauth: Fix using USER environment when running standalone

diff --git a/src/imap-urlauth/imap-urlauth-worker.c b/src/imap-urlauth/imap-urlauth-worker.c
index 79b14d83d3e9c3d73ca660fa19878ea78318980d..ad50dd15dccb5f9773278383b79184ded3c888eb 100644 (file)
--- a/src/imap-urlauth/imap-urlauth-worker.c
+++ b/src/imap-urlauth/imap-urlauth-worker.c
@@ -1018,7 +1018,12 @@ int main(int argc, char *argv[])
        master_service_init_log_with_pid(master_service);
        master_service_set_die_callback(master_service, imap_urlauth_worker_die);
 
-       if (master_service_settings_read_simple(master_service, &error) < 0)
+       struct master_service_settings_input set_input = {
+               .preserve_user = TRUE,
+       };
+       struct master_service_settings_output set_output;
+       if (master_service_settings_read(master_service, &set_input,
+                                        &set_output, &error) < 0)
                i_fatal("%s", error);
 
        storage_service =

diff --git a/src/imap-urlauth/imap-urlauth.c b/src/imap-urlauth/imap-urlauth.c
index bb318283297b985d711135ff28ad4e46f62bef29..741b6afaa14e3a7e9371c10a519e8e91de396296 100644 (file)
--- a/src/imap-urlauth/imap-urlauth.c
+++ b/src/imap-urlauth/imap-urlauth.c
@@ -237,7 +237,12 @@ int main(int argc, char *argv[])
                return FATAL_DEFAULT;
        master_service_init_log(master_service);
 
-       if (master_service_settings_read_simple(master_service, &error) < 0)
+       struct master_service_settings_input set_input = {
+               .preserve_user = TRUE,
+       };
+       struct master_service_settings_output set_output;
+       if (master_service_settings_read(master_service, &set_input,
+                                        &set_output, &error) < 0)
                i_fatal("%s", error);
 
        imap_urlauth_settings = 

diff --git a/src/imap/main.c b/src/imap/main.c
index 5296eeba5a8e85f05e1b516ed093f82b35907dff..34a355521e861fdd6c7177d07462113257f39cd1 100644 (file)
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -546,7 +546,12 @@ int main(int argc, char *argv[])
        master_admin_clients_init(&admin_callbacks);
        master_service_set_die_callback(master_service, imap_die);
 
-       if (master_service_settings_read_simple(master_service, &error) < 0)
+       struct master_service_settings_input set_input = {
+               .preserve_user = TRUE,
+       };
+       struct master_service_settings_output set_output;
+       if (master_service_settings_read(master_service, &set_input,
+                                        &set_output, &error) < 0)
                i_fatal("%s", error);
 
        /* plugins may want to add commands, so this needs to be called early */

diff --git a/src/pop3/main.c b/src/pop3/main.c
index acb65c31bc95cfbca9d5693df6e4c5122762af5b..e9a63e2745f9845dea61d9f1166d57ae9c253804 100644 (file)
--- a/src/pop3/main.c
+++ b/src/pop3/main.c
@@ -421,7 +421,12 @@ int main(int argc, char *argv[])
                }
        }
 
-       if (master_service_settings_read_simple(master_service, &error) < 0)
+       struct master_service_settings_input set_input = {
+               .preserve_user = TRUE,
+       };
+       struct master_service_settings_output set_output;
+       if (master_service_settings_read(master_service, &set_input,
+                                        &set_output, &error) < 0)
                i_fatal("%s", error);
 
        const struct master_service_settings *master_set =

diff --git a/src/submission/main.c b/src/submission/main.c
index 62f6b07d0e3fd1e8e45bea466fd6b3fa665d3b20..9684d9d83d81b9276b6572266ad78c3aad9fcda4 100644 (file)
--- a/src/submission/main.c
+++ b/src/submission/main.c
@@ -415,7 +415,12 @@ int main(int argc, char *argv[])
        master_admin_clients_init(&admin_callbacks);
        master_service_set_die_callback(master_service, submission_die);
 
-       if (master_service_settings_read_simple(master_service, &error) < 0)
+       struct master_service_settings_input set_input = {
+               .preserve_user = TRUE,
+       };
+       struct master_service_settings_output set_output;
+       if (master_service_settings_read(master_service, &set_input,
+                                        &set_output, &error) < 0)
                i_fatal("%s", error);
 
        const struct master_service_settings *master_set =