From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 14 Mar 2015 11:45:55 +0000 (+0000)
Subject: Merge remote-tracking branch 'seehuhn/1.1' into 1.1
X-Git-Tag: release-1.1pre12~196
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=04fc19112da5e7fcefefcf6e490987cdcfb6f620;p=tinc

Merge remote-tracking branch 'seehuhn/1.1' into 1.1
---

04fc19112da5e7fcefefcf6e490987cdcfb6f620
diff --cc src/process.c
index 2243bf9c,86953adc..2dab2b58
--- a/src/process.c
+++ b/src/process.c
@@@ -210,10 -209,13 +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, __DATE__, __TIME__, debug_level);
 +			   VERSION, BUILD_DATE, BUILD_TIME, debug_level);
  
  	return true;
  }