From: Felix Morgner <felix.morgner@gmail.com>
Date: Thu, 26 Jan 2017 12:12:25 +0000 (+0100)
Subject: Merge pull request #80 from Nauxuron/master
X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=commitdiff_plain;h=b46618c8bbe5195c7fcb4d9c1c4b8129d25d0244;hp=a80a3363723e4f8c35acf63274332e20c35616ce

Merge pull request #80 from Nauxuron/master
---

diff --git a/src/main.c b/src/main.c
index bc91339..c74d964 100644
--- a/src/main.c
+++ b/src/main.c
@@ -322,7 +322,6 @@ int main(int argc, char **argv)
 			Log_init(false);
 			if (pidfile != NULL)
 				lockfile(pidfile);
-
 #ifdef POSIX_PRIORITY_SCHEDULING
 			/* Set the scheduling policy, has to be called after daemonizing
 			 * but before we drop privileges */
@@ -330,12 +329,6 @@ int main(int argc, char **argv)
 				setscheduler();
 #endif
 
-			switch_user();
-
-			/* Reopen log file. If user switch results in access denied, we catch
-			 * it early.
-			 */
-			Log_reset();
 		}
 		else Log_init(true);
 
@@ -376,6 +369,16 @@ int main(int argc, char **argv)
     Sharedmemory_init( bindport, bindport6 );
 #endif
 
+		if(!nodaemon) {
+			/* SSL and scheduling is setup, we can drop privileges now */
+			switch_user();
+
+			/* Reopen log file. If user switch results in access denied, we catch
+			 * it early.
+			 */
+			Log_reset();
+		}
+
 		Server_run();
 
 #ifdef USE_SHAREDMEMORY_API