Import release 0.1.10

[secnet.git] / log.c

diff --git a/log.c b/log.c
index 0981506cc696116a5223a5d783cdcd3d08e53d4e..32f0901e96830b3df1fdc5dac346c09a3d9b6149 100644 (file)
--- a/log.c
+++ b/log.c
@@ -8,7 +8,7 @@
 #include "process.h"
 
 bool_t secnet_is_daemon=False;
-uint32_t message_level=M_WARNING|M_ERROR|M_SECURITY|M_FATAL;
+uint32_t message_level=M_WARNING|M_ERR|M_SECURITY|M_FATAL;
 struct log_if *system_log=NULL;
 
 static void vMessage(uint32_t class, char *message, va_list args)
@@ -32,7 +32,7 @@ static void vMessage(uint32_t class, char *message, va_list args)
     } else {
        /* Messages go to stdout/stderr */
        if (class & message_level) {
-           if (class&M_FATAL || class&M_ERROR || class&M_WARNING) {
+           if (class&M_FATAL || class&M_ERR || class&M_WARNING) {
                dest=stderr;
            }
            vfprintf(dest,message,args);
@@ -271,11 +271,11 @@ static struct flagstr message_class_table[]={
     { "info", M_INFO },
     { "notice", M_NOTICE },
     { "warning", M_WARNING },
-    { "error", M_ERROR },
+    { "error", M_ERR },
     { "security", M_SECURITY },
     { "fatal", M_FATAL },
-    { "default", M_WARNING|M_ERROR|M_SECURITY|M_FATAL },
-    { "verbose", M_INFO|M_NOTICE|M_WARNING|M_ERROR|M_SECURITY|M_FATAL },
+    { "default", M_WARNING|M_ERR|M_SECURITY|M_FATAL },
+    { "verbose", M_INFO|M_NOTICE|M_WARNING|M_ERR|M_SECURITY|M_FATAL },
     { "quiet", M_FATAL },
     { NULL, 0 }
 };
@@ -334,7 +334,7 @@ static int msgclass_to_syslogpriority(uint32_t m)
     case M_INFO: return LOG_INFO;
     case M_NOTICE: return LOG_NOTICE;
     case M_WARNING: return LOG_WARNING;
-    case M_ERROR: return LOG_ERR;
+    case M_ERR: return LOG_ERR;
     case M_SECURITY: return LOG_CRIT;
     case M_FATAL: return LOG_EMERG;
     default: return LOG_NOTICE;
@@ -364,7 +364,12 @@ static void syslog_log(void *sst, int priority, char *message, ...)
 }
 
 static struct flagstr syslog_facility_table[]={
+#ifdef LOG_AUTH
+    { "auth", LOG_AUTH },
+#endif
+#ifdef LOG_AUTHPRIV
     { "authpriv", LOG_AUTHPRIV },
+#endif
     { "cron", LOG_CRON },
     { "daemon", LOG_DAEMON },
     { "kern", LOG_KERN },