From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Tue, 5 Sep 2023 11:16:33 +0000 (+0300)
Subject: lib-master: Clean environment after master service has initialized
X-Git-Tag: 2.4.0~2593
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=834b5e348ab1fe591213703a356418b86780d067;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Clean environment after master service has initialized
---

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index 9898c3d09c..cecb753780 100644
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -627,6 +627,18 @@ master_service_init(const char *name, enum master_service_flags flags,
 	}
 
 	master_service_verify_version_string(service);
+
+	if ((service->flags & MASTER_SERVICE_FLAG_STANDALONE) == 0) {
+		env_remove(MASTER_SERVICE_ENV);
+		env_remove(MASTER_SERVICE_SOCKET_COUNT_ENV);
+		env_remove(MASTER_UID_ENV);
+		env_remove(MASTER_CONFIG_FILE_ENV);
+		T_BEGIN {
+			for (unsigned int i = 0; i < service->socket_count; i++)
+				env_remove(t_strdup_printf("SOCKET%u_SETTINGS", i));
+		} T_END;
+	}
+
 	return service;
 }