From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sun, 18 Dec 2022 21:09:36 +0000 (+0200)
Subject: lib-master: Remove support for reading settings from environment
X-Git-Tag: 2.4.0~3064
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df2bb8bce63eccddef9ff8ae68eef04c7d886133;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Remove support for reading settings from environment

This is no longer necessary with doveconf -F parameter. The settings were
previously also being read from environment if -k parameter was used, but
there was never any real benefit in doing that. This change was introduced
by a88696bd63b2ce0f7b02ee3352e4bf739497352a simply to keep the behavior
identical when reading settings via doveconf vs config socket.
---

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index 31b2ed02e5..e5604d9a8c 100644
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -522,7 +522,6 @@ int master_service_settings_read(struct master_service *service,
 	const char *path = NULL, *value, *error;
 	unsigned int i;
 	int ret, fd = -1;
-	bool use_environment = FALSE;
 
 	i_zero(output_r);
 	output_r->config_fd = -1;
@@ -539,9 +538,6 @@ int master_service_settings_read(struct master_service *service,
 		if (str_to_int(value, &fd) < 0 || fd < 0)
 			i_fatal("Invalid "DOVECOT_CONFIG_FD_ENV": %s", value);
 		path = t_strdup_printf("<"DOVECOT_CONFIG_FD_ENV" %d>", fd);
-	} else if (getenv("DOVECONF_ENV") != NULL) {
-		use_environment = (service->flags &
-				   MASTER_SERVICE_FLAG_NO_CONFIG_SETTINGS) == 0;
 	} else if ((service->flags & MASTER_SERVICE_FLAG_NO_CONFIG_SETTINGS) == 0) {
 		/* Open config via socket if possible. If it doesn't work,
 		   execute doveconf -F. */
@@ -624,14 +620,6 @@ int master_service_settings_read(struct master_service *service,
 	}
 	event_unref(&event);
 
-	if (use_environment || service->keep_environment) {
-		if (settings_parse_environ(parser) < 0) {
-			*error_r = t_strdup(settings_parser_get_error(parser));
-			settings_parser_unref(&parser);
-			return -1;
-		}
-	}
-
 	if (array_is_created(&service->config_overrides)) {
 		if (master_service_apply_config_overrides(service, parser,
 							  error_r) < 0) {