From: Timo Sirainen <tss@iki.fi>
Date: Thu, 18 Mar 2010 02:00:17 +0000 (+0200)
Subject: lib-master: -k parameter now always applies settings from environment.
X-Git-Tag: 2.0.beta4~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a88696bd63b2ce0f7b02ee3352e4bf739497352a;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: -k parameter now always applies settings from environment.
Otherwise the result would be inconsistent when executing doveconf vs.
using config socket.

--HG--
branch : HEAD
---

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index 6b8ed15cc3..0c519b374b 100644
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -365,7 +365,9 @@ int master_service_settings_read(struct master_service *service,
 			service->config_fd = fd;
 		else
 			(void)close(fd);
-	} else {
+	}
+
+	if (fd == -1 || service->keep_environment) {
 		if (settings_parse_environ(parser) < 0) {
 			*error_r = settings_parser_get_error(parser);
 			return -1;