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

diff --cc src/process.c
index 2243bf9,86953ad..2dab2b5
--- 1/src/process.c
--- 2/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;
  }

diff --cc src/tincd.c
Simple merge