From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 29 Nov 2022 18:46:28 +0000 (+0200)
Subject: lib-master: -O parameter shouldn't read settings from environment
X-Git-Tag: 2.4.0~3102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3d2146058397824a2404e62aeb0ffd707b82caf;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: -O parameter shouldn't read settings from environment

The -O parameter should start with the default configuration only. This
seems to have been an accidental bug, which was just never noticed.
---

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index 2f75197f0a..d09dec38b2 100644
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -676,7 +676,8 @@ int master_service_settings_read(struct master_service *service,
 			i_close_fd(&fd);
 		use_environment = FALSE;
 	} else {
-		use_environment = TRUE;
+		use_environment = (service->flags &
+				   MASTER_SERVICE_FLAG_NO_CONFIG_SETTINGS) == 0;
 	}
 
 	if (use_environment || service->keep_environment) {