From: Felix Morgner <felix.morgner@gmail.com>
Date: Thu, 26 Jan 2017 12:08:41 +0000 (+0100)
Subject: Adjust pull request #80
X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=commitdiff_plain;h=ec643e91b6f4e22c56d8ab7c89a681f84931af91

Adjust pull request #80
---

ec643e91b6f4e22c56d8ab7c89a681f84931af91
diff --cc src/main.c
index bc91339,d98fb6a..c74d964
--- a/src/main.c
+++ b/src/main.c
@@@ -322,20 -322,6 +322,13 @@@ 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 */
 +			if (realtime)
 +				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 -353,17 +369,16 @@@
      Sharedmemory_init( bindport, bindport6 );
  #endif
  
 -#ifdef POSIX_PRIORITY_SCHEDULING
 -		if (realtime)
 -			setscheduler();
 -#endif
++		if(!nodaemon) {
++			/* SSL and scheduling is setup, we can drop privileges now */
++			switch_user();
+ 
 -		switch_user();
 -		/* Reopen log file. If user switch results in access denied, we catch
 -		 * it early.
 -		 */
 -		Log_reset();
++			/* Reopen log file. If user switch results in access denied, we catch
++			 * it early.
++			 */
++			Log_reset();
++		}
+ 
  		Server_run();
  
  #ifdef USE_SHAREDMEMORY_API