dovecot-2.0: lib-master: -k parameter now always applies setting...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/480bf5fefcce
changeset: 10940:480bf5fefcce
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Mar 18 04:00:17 2010 +0200
description:
lib-master: -k parameter now always applies settings from environment.
Otherwise the result would be inconsistent when executing doveconf vs.
using config socket.

diffstat:

 src/lib-master/master-service-settings.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (14 lines):

diff -r 53dadf274cc7 -r 480bf5fefcce src/lib-master/master-service-settings.c
--- 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;