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 b6d2a5d082f8b678e7955f428fc3c7dd25fe45ac..61a64e5aa60e68673e7d0f63280db78e2f4f06cb 100644 (file)
--- 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);
 }