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 2f75197f0a729ae35f6c42307582cc629c1ab4e7..d09dec38b24a56f3b371e442ed75242a9306bc5a 100644 (file)
--- 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) {