Clean up ac5c1024.
authorLinus Nordberg <linus@nordu.net>
Mon, 12 Dec 2011 12:44:17 +0000 (13:44 +0100)
committerLinus Nordberg <linus@nordu.net>
Mon, 12 Dec 2011 12:59:33 +0000 (13:59 +0100)
1  2 
debug.c

diff --cc debug.c
+++ b/debug.c
@@@ -107,23 -104,21 +107,21 @@@ int debug_set_destination(char *dest, i
                    break;
            if (!facstrings[i])
                debugx(1, DBG_ERR, "Unknown syslog facility %s", dest);
-           if (log_type == FTICKS_LOG)
-               fticks_syslogfacility = facvals[i];
-           else
++          if (log_type != FTICKS_LOG)
 +              debug_syslogfacility = facvals[i];
+ #if defined(WANT_FTICKS)
 -          if (log_type==FTICKS_LOG)
++            else if (log_type == FTICKS_LOG)
+               fticks_syslogfacility = facvals[i];
+ #endif
 -          if (log_type!=FTICKS_LOG)
 -              debug_syslogfacility = facvals[i];
        } else {
-             if (log_type == FTICKS_LOG)
-                 fticks_syslogfacility = 0;
-             else
++            if (log_type != FTICKS_LOG)
 +                debug_syslogfacility = LOG_DAEMON;
+ #if defined(WANT_FTICKS)
 -              if (log_type==FTICKS_LOG)
 -                 fticks_syslogfacility = 0;
++            else if (log_type == FTICKS_LOG)
++                fticks_syslogfacility = 0;
+ #endif
 -              if (log_type!=FTICKS_LOG)
 -                 debug_syslogfacility = LOG_DAEMON;
        }
-       if (log_type == FTICKS_LOG) {
-             if (fticks_syslogfacility && !debug_syslogfacility) {
-                 openlog(debug_ident, LOG_PID, fticks_syslogfacility);
-             }
-       } else {
-             openlog(debug_ident, LOG_PID, debug_syslogfacility);
-         }
+       openlog(debug_ident, LOG_PID, debug_syslogfacility);
        return 1;
      }
      debug(DBG_ERR, "Unknown log destination, exiting %s", dest);