changeset 20704:70a4f52e32b3

lmtp: Always read settings before dropping privs If lmtp is ran explicitly as root, settings were not read.
author Aki Tuomi <aki.tuomi@dovecot.fi>
date Wed, 07 Sep 2016 22:06:55 +0300
parents 5ac29b54b474
children 21b48eb9ce22
files src/lmtp/main.c
diffstat 1 files changed, 8 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/lmtp/main.c	Wed Sep 07 22:00:14 2016 +0300
+++ b/src/lmtp/main.c	Wed Sep 07 22:06:55 2016 +0300
@@ -42,17 +42,15 @@
 
 	/* 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;
+	/* 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);
-	}
+	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);
 }