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 6b8ed15cc33b904d3ac09ae68bc1aa6bf3972bbc..0c519b374b9b7116555269864310c3e52e5302c4 100644 (file)
--- 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;