X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprocess.c;h=86953adccf60cc05c09e36e435612696cd1776c7;hb=19d16e40ccfb39461eda5336f4e754e10a640aba;hp=c1038bcd62165728a026742ab1034b44c40ca7ec;hpb=058473dc8d4cf60f79aee18d473342b8a3c25fbe;p=tinc

diff --git a/src/process.c b/src/process.c
index c1038bcd..86953adc 100644
--- a/src/process.c
+++ b/src/process.c
@@ -41,6 +41,7 @@ bool sigalrm = false;
 
 extern char **g_argv;
 extern bool use_logfile;
+extern bool use_syslog;
 
 /* Some functions the less gifted operating systems might lack... */
 
@@ -185,6 +186,8 @@ bool init_service(void) {
   Detach from current terminal
 */
 bool detach(void) {
+	logmode_t logmode;
+
 #ifndef HAVE_MINGW
 	signal(SIGPIPE, SIG_IGN);
 	signal(SIGUSR1, SIG_IGN);
@@ -206,12 +209,13 @@ bool detach(void) {
 #endif
 	}
 
-	openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
+	logmode = use_logfile?LOGMODE_FILE:LOGMODE_SYSLOG;
+	if(do_detach && !use_syslog)
+		logmode = LOGMODE_STDERR;
+	openlogger(identname, logmode);
 
 	logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
 			   VERSION, __DATE__, __TIME__, debug_level);
 
 	return true;
 }
-
-