Mercurial > dovecot > core-2.2

changeset 10940:480bf5fefcce HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-master: -k parameter now always applies settings from environment. Otherwise the result would be inconsistent when executing doveconf vs. using config socket.
author Timo Sirainen <tss@iki.fi>
date Thu, 18 Mar 2010 04:00:17 +0200
parents 53dadf274cc7
children f7d14405de09
files src/lib-master/master-service-settings.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-master/master-service-settings.c	Thu Mar 18 03:50:53 2010 +0200
+++ b/src/lib-master/master-service-settings.c	Thu Mar 18 04:00:17 2010 +0200
@@ -365,7 +365,9 @@
 			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;