- jakob@cvs.openbsd.org 2001/07/31 09:28:44

[openssh.git] / log.c

diff --git a/log.c b/log.c
index a71625f12f7dcbf03a4e542e512ccb266bff06e8..39bc8b5d75a3aca0a5bcdb8a68f5745a3c34450c 100644 (file)
--- a/log.c
+++ b/log.c
@@ -34,7 +34,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: log.c,v 1.17 2001/03/04 17:42:28 millert Exp $");
+RCSID("$OpenBSD: log.c,v 1.18 2001/06/26 17:27:23 markus Exp $");
 
 #include "log.h"
 #include "xmalloc.h"
@@ -57,6 +57,9 @@ static struct {
        { "DAEMON",     SYSLOG_FACILITY_DAEMON },
        { "USER",       SYSLOG_FACILITY_USER },
        { "AUTH",       SYSLOG_FACILITY_AUTH },
+#ifdef LOG_AUTHPRIV
+       { "AUTHPRIV",   SYSLOG_FACILITY_AUTHPRIV },
+#endif
        { "LOCAL0",     SYSLOG_FACILITY_LOCAL0 },
        { "LOCAL1",     SYSLOG_FACILITY_LOCAL1 },
        { "LOCAL2",     SYSLOG_FACILITY_LOCAL2 },
@@ -85,6 +88,8 @@ static struct {
        { NULL, 0 }
 };
 
+static void     do_log(LogLevel level, const char *fmt, va_list args);
+
 SyslogFacility
 log_facility_number(char *name)
 {
@@ -265,7 +270,7 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
                log_level = level;
                break;
        default:
-               fprintf(stderr, "Unrecognized internal syslog level code %d",
+               fprintf(stderr, "Unrecognized internal syslog level code %d\n",
                    (int) level);
                exit(1);
        }
@@ -284,10 +289,10 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
        case SYSLOG_FACILITY_AUTH:
                log_facility = LOG_AUTH;
                break;
-#ifdef LOG_AUTHPRIV            /** BAL: Verify */
-       case SYSLOG_FACILITY_AUTHPRIV
-               log_facility = AUTHPRIV;
-               break
+#ifdef LOG_AUTHPRIV
+       case SYSLOG_FACILITY_AUTHPRIV:
+               log_facility = LOG_AUTHPRIV;
+               break;
 #endif
        case SYSLOG_FACILITY_LOCAL0:
                log_facility = LOG_LOCAL0;
@@ -315,7 +320,7 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
                break;
        default:
                fprintf(stderr,
-                   "Unrecognized internal syslog facility code %d",
+                   "Unrecognized internal syslog facility code %d\n",
                    (int) facility);
                exit(1);
        }
@@ -323,7 +328,7 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
 
 #define MSGBUFSIZ 1024
 
-void
+static void
 do_log(LogLevel level, const char *fmt, va_list args)
 {
        char msgbuf[MSGBUFSIZ];