X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flogger.c;h=871f2c14d25aaf7efb8df78acf9827e75505af13;hp=012f19d0f0eecf27e2d60d33dd1c56b33cf06fe2;hb=714fb32d0377ed9f5643ed8f0bd914843d12266b;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a

diff --git a/src/logger.c b/src/logger.c
index 012f19d0..871f2c14 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -17,27 +17,22 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: logger.c,v 1.1.2.3 2003/07/12 17:41:45 guus Exp $
+    $Id: logger.c,v 1.1.2.7 2003/07/29 10:50:15 guus Exp $
 */
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <syslog.h>
-#include <unistd.h>
+#include "system.h"
 
 #include "conf.h"
 #include "logger.h"
 
-#include "system.h"
-
-int debug_level = DEBUG_NOTHING;
-static int logmode = LOGMODE_STDERR;
+debug_t debug_level = DEBUG_NOTHING;
+static logmode_t logmode = LOGMODE_STDERR;
 static pid_t logpid;
 extern char *logfilename;
 static FILE *logfile = NULL;
 static const char *logident = NULL;
 
-void openlogger(const char *ident, int mode) {
+void openlogger(const char *ident, logmode_t mode) {
 	logident = ident;
 	logmode = mode;
 	
@@ -52,8 +47,12 @@ void openlogger(const char *ident, int mode) {
 				logmode = LOGMODE_NULL;
 			break;
 		case LOGMODE_SYSLOG:
+#ifdef HAVE_SYSLOG_H
 			openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
 			break;
+#endif
+		case LOGMODE_NULL:
+			break;
 	}
 }
 
@@ -73,6 +72,7 @@ void logger(int priority, const char *format, ...) {
 			fprintf(logfile, "\n");
 			break;
 		case LOGMODE_SYSLOG:
+#ifdef HAVE_SYSLOG_H
 #ifdef HAVE_VSYSLOG
 			vsyslog(priority, format, ap);
 #else
@@ -83,6 +83,9 @@ void logger(int priority, const char *format, ...) {
 			}
 #endif
 			break;
+#endif
+		case LOGMODE_NULL:
+			break;
 	}
 
 	va_end(ap);
@@ -94,7 +97,13 @@ void closelogger(void) {
 			fclose(logfile);
 			break;
 		case LOGMODE_SYSLOG:
+#ifdef HAVE_SYSLOG_H
 			closelog();
 			break;
+#endif
+		case LOGMODE_NULL:
+		case LOGMODE_STDERR:
+			break;
+			break;
 	}
 }