X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=debug.c;h=4f6f59ef0a153ff6a7df5c2fd804c499d2ebaec4;hb=dbcc997716f5bec3316c74371eb8077884d6672d;hp=79d0f9d1fa03616222f71500a5972bc2dab322fc;hpb=b5bdc1d887a519de1d96d6da4534fbbe1210ee2d;p=libradsec.git

diff --git a/debug.c b/debug.c
index 79d0f9d..4f6f59e 100644
--- a/debug.c
+++ b/debug.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010 NORDUnet A/S
+ * Copyright (C) 2010,2011 NORDUnet A/S
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -32,12 +32,6 @@ static int debug_syslogfacility = 0;
 static int fticks_syslogfacility = 0;
 #endif
 static uint8_t debug_timestamp = 0;
-static const char *facstrings[] = { "LOG_DAEMON", "LOG_MAIL", "LOG_USER", "LOG_LOCAL0",
-	"LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4",
-	"LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", NULL };
-static const int facvals[] = { LOG_DAEMON, LOG_MAIL, LOG_USER, LOG_LOCAL0,
-	LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4,
-	LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
 
 void debug_init(char *ident) {
     debug_file = stderr;
@@ -73,61 +67,60 @@ uint8_t debug_get_level() {
     return debug_level;
 }
 
-#if defined(WANT_FTICKS)
-int debug_set_ftickssyslogfacility(char *dest) {
-    int i;
-    if (!strncasecmp(dest, "x-syslog://", 11)) {
-	dest += 11;
-	if (*dest == '/')
-	    dest++;
-    }
-    if (*dest) {
-    	for (i = 0; facstrings[i]; i++)
-	    if (!strcasecmp(dest, facstrings[i]))
-	        break;
-        if (!facstrings[i]) {
-    	    debug(DBG_ERR, "Unknown syslog facility %s for F-Ticks, assuming default", dest);
-	    fticks_syslogfacility = 0;
-    	} else
-	    fticks_syslogfacility = facvals[i];
-    } else {
-	fticks_syslogfacility = 0;
-    }
-    if (fticks_syslogfacility && !debug_syslogfacility) {
-	openlog(debug_ident, LOG_PID, fticks_syslogfacility);
-    }	
-    return 1;
-}
-#endif
-
-int debug_set_destination(char *dest) {
+int debug_set_destination(char *dest, int log_type) {
+    static const char *facstrings[] = {
+        "LOG_DAEMON", "LOG_MAIL", "LOG_USER", "LOG_LOCAL0",
+	"LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4",
+	"LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", NULL };
+    static const int facvals[] = {
+        LOG_DAEMON, LOG_MAIL, LOG_USER, LOG_LOCAL0,
+	LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4,
+	LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
     extern int errno;
     int i;
 
     if (!strncasecmp(dest, "file:///", 8)) {
-	debug_filepath = stringcopy(dest + 7, 0);
-	debug_file = fopen(debug_filepath, "a");
-	if (!debug_file) {
-	    debug_file = stderr;
-	    debugx(1, DBG_ERR, "Failed to open logfile %s\n%s",
-		   debug_filepath, strerror(errno));
+	if (log_type != LOG_TYPE_FTICKS) {
+	    debug_filepath = stringcopy(dest + 7, 0);
+	    debug_file = fopen(debug_filepath, "a");
+	    if (!debug_file) {
+	        debug_file = stderr;
+	        debugx(1, DBG_ERR, "Failed to open logfile %s\n%s",
+                       debug_filepath, strerror(errno));
+	    }
+	    setvbuf(debug_file, NULL, _IONBF, 0);
+	} else {
+	    debug(DBG_WARN, "FTicksSyslogFacility starting with file:/// not "
+                  "permitted, assuming default F-Ticks destination");
 	}
-	setvbuf(debug_file, NULL, _IONBF, 0);
 	return 1;
     }
-    if (!strncasecmp(dest, "x-syslog://", 11)) {
-	dest += 11;
-	if (*dest == '/')
-	    dest++;
+    if (!strncasecmp(dest, "x-syslog://", 11) || log_type == LOG_TYPE_FTICKS) {
+	if (!strncasecmp(dest, "x-syslog://", 11)) {
+            dest += 11;
+            if (*dest == '/')
+                dest++;
+	}
 	if (*dest) {
 	    for (i = 0; facstrings[i]; i++)
 		if (!strcasecmp(dest, facstrings[i]))
 		    break;
 	    if (!facstrings[i])
 		debugx(1, DBG_ERR, "Unknown syslog facility %s", dest);
-	    debug_syslogfacility = facvals[i];
-	} else
-	    debug_syslogfacility = LOG_DAEMON;
+	    if (log_type != LOG_TYPE_FTICKS)
+		debug_syslogfacility = facvals[i];
+#if defined(WANT_FTICKS)
+            else if (log_type == LOG_TYPE_FTICKS)
+		fticks_syslogfacility = facvals[i];
+#endif
+	} else {
+            if (log_type != LOG_TYPE_FTICKS)
+                debug_syslogfacility = LOG_DAEMON;
+#if defined(WANT_FTICKS)
+            else if (log_type == LOG_TYPE_FTICKS)
+                fticks_syslogfacility = 0;
+#endif
+    	}
 	openlog(debug_ident, LOG_PID, debug_syslogfacility);
 	return 1;
     }
@@ -251,11 +244,7 @@ void fticks_debug(const char *format, ...) {
     if (!debug_syslogfacility && !fticks_syslogfacility)
     	debug_logit(0xff, format, ap);
     else {
-    	if (fticks_syslogfacility) {
-    	    priority = LOG_DEBUG|fticks_syslogfacility;
-    	} else {
-    	    priority = LOG_DEBUG;
-    	}
+    	priority = LOG_DEBUG | fticks_syslogfacility;
     	vsyslog(priority, format, ap);
     	va_end(ap);
     }