20010115

[openssh.git] / log.c

diff --git a/log.c b/log.c
index e75c6c46f9c29de3d2dab085ced0fde6dd9b9b43..e13cc90ceb3d41978f1b303d97315703beb5cb0a 100644 (file)
--- a/log.c
+++ b/log.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: log.c,v 1.11 2000/09/30 16:27:43 markus Exp $");
+RCSID("$OpenBSD: log.c,v 1.13 2001/01/07 11:28:05 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -71,7 +71,7 @@ log(const char *fmt,...)
 {
        va_list args;
        va_start(args, fmt);
-       do_log(SYSLOG_LEVEL_INFO, fmt, args);
+       do_log(SYSLOG_LEVEL_NOTICE, fmt, args);
        va_end(args);
 }
 
@@ -155,7 +155,7 @@ fatal_remove_cleanup(void (*proc) (void *context), void *context)
                }
        }
        fatal("fatal_remove_cleanup: no such cleanup function: 0x%lx 0x%lx\n",
-             (unsigned long) proc, (unsigned long) context);
+             (u_long) proc, (u_long) context);
 }
 
 /* Cleanup and exit */
@@ -172,7 +172,7 @@ fatal_cleanup(void)
        for (cu = fatal_cleanups; cu; cu = next_cu) {
                next_cu = cu->next;
                debug("Calling cleanup 0x%lx(0x%lx)",
-                     (unsigned long) cu->proc, (unsigned long) cu->context);
+                     (u_long) cu->proc, (u_long) cu->context);
                (*cu->proc) (cu->context);
        }
        exit(255);
@@ -209,12 +209,13 @@ static struct {
        { "QUIET",      SYSLOG_LEVEL_QUIET },
        { "FATAL",      SYSLOG_LEVEL_FATAL },
        { "ERROR",      SYSLOG_LEVEL_ERROR },
-       { "INFO",       SYSLOG_LEVEL_INFO },
+       { "NOTICE",     SYSLOG_LEVEL_NOTICE },
        { "VERBOSE",    SYSLOG_LEVEL_VERBOSE },
        { "DEBUG",      SYSLOG_LEVEL_DEBUG1 },
        { "DEBUG1",     SYSLOG_LEVEL_DEBUG1 },
        { "DEBUG2",     SYSLOG_LEVEL_DEBUG2 },
        { "DEBUG3",     SYSLOG_LEVEL_DEBUG3 },
+       { "INFO",       SYSLOG_LEVEL_NOTICE },  /* backward compatible */
        { NULL, 0 }
 };