From: Linus Nordberg <linus@nordu.net>
Date: Mon, 12 Dec 2011 12:44:17 +0000 (+0100)
Subject: Clean up ac5c1024.
X-Git-Tag: radsecproxy-1.6-rc0~44^2~6
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=libradsec.git;a=commitdiff_plain;h=000cfa8160cf40bdf8f4c936715dcaeaf3360dc2

Clean up ac5c1024.
---

000cfa8160cf40bdf8f4c936715dcaeaf3360dc2
diff --cc debug.c
index 736a762,4f8f51c..2ec8ef3
--- a/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);