X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprocess.c;fp=src%2Fprocess.c;h=2dab2b58b2e1a84e86b6e80d8f8a609e12f1d8eb;hb=04fc19112da5e7fcefefcf6e490987cdcfb6f620;hp=2243bf9c46c46b569d404f4af2b79e73f4bc69a5;hpb=f9ecaa10768926302f24a70975f36e360b51c8ce;p=tinc

diff --git a/src/process.c b/src/process.c
index 2243bf9c..2dab2b58 100644
--- a/src/process.c
+++ b/src/process.c
@@ -42,6 +42,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... */
 
@@ -189,6 +190,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);
@@ -210,12 +213,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, BUILD_DATE, BUILD_TIME, debug_level);
 
 	return true;
 }
-
-