From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 30 Jul 2025 10:20:23 +0000 (+0300)
Subject: imap, pop3, submission, imap-urlauth: Fix using USER environment when running standalone
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30ca063f342f0b4297095ad699d5ecb685966bff;p=thirdparty%2Fdovecot%2Fcore.git

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 79b14d83d3..ad50dd15dc 100644
--- 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 bb31828329..741b6afaa1 100644
--- 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 5296eeba5a..34a355521e 100644
--- 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 acb65c31bc..e9a63e2745 100644
--- 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 62f6b07d0e..9684d9d83d 100644
--- 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 =