From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Wed, 7 Sep 2016 19:06:55 +0000 (+0300)
Subject: lmtp: Always read settings before dropping privs
X-Git-Tag: 2.2.26~297
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91f029608947d4fa49b3c2c1a15a25eb75343147;p=thirdparty%2Fdovecot%2Fcore.git

lmtp: Always read settings before dropping privs

If lmtp is ran explicitly as root, settings were not read.
---

diff --git a/src/lmtp/main.c b/src/lmtp/main.c
index b6d2a5d082..61a64e5aa6 100644
--- a/src/lmtp/main.c
+++ b/src/lmtp/main.c
@@ -42,17 +42,15 @@ static void drop_privileges(void)
 
 	/* by default we don't drop any privileges, but keep running as root. */
 	restrict_access_get_env(&set);
-	if (set.uid != 0) {
-		/* open config connection before dropping privileges */
-		struct master_service_settings_input input;
-		struct master_service_settings_output output;
-
-		memset(&input, 0, sizeof(input));
-		input.module = "lmtp";
-		input.service = "lmtp";
-		(void)master_service_settings_read(master_service,
-						   &input, &output, &error);
-	}
+	/* open config connection before dropping privileges */
+	struct master_service_settings_input input;
+	struct master_service_settings_output output;
+
+	memset(&input, 0, sizeof(input));
+	input.module = "lmtp";
+	input.service = "lmtp";
+	(void)master_service_settings_read(master_service,
+					   &input, &output, &error);
 	restrict_access_by_env(NULL, FALSE);
 }