- (djm) Fix up LOG_AUTHPRIV for systems that have it

diff --git a/ChangeLog b/ChangeLog
index 1a9d760c9372c1ef9bafe87051fab100185bd025..3d9d676b735d87613fe83054e8d1d8085a4e590b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -170,6 +170,7 @@
      list SSH2 ciphers
  - (bal) Put HAVE_PW_CLASS_IN_PASSWD back into pwcopy()
  - (bal) Fix up logging since it changed.  removed log-*.c
+ - (djm) Fix up LOG_AUTHPRIV for systems that have it
 
 20010304
  - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.

diff --git a/log.c b/log.c
index 11633fe3fd19703d0af1c7c5cb6ab4b067929f73..6131f4cdd3f66ac4e67aab68b606017f8cbc724c 100644 (file)
--- a/log.c
+++ b/log.c
@@ -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 },
@@ -284,12 +287,10 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
        case SYSLOG_FACILITY_AUTH:
                log_facility = LOG_AUTH;
                break;
-#if 0                  /* This is broken. =) - BAL */
-#ifdef LOG_AUTHPRIV            /** BAL: Verify */
-       case SYSLOG_FACILITY_AUTHPRIV
-               log_facility = AUTHPRIV;
-               break
-#endif
+#ifdef LOG_AUTHPRIV
+       case SYSLOG_FACILITY_AUTHPRIV:
+               log_facility = LOG_AUTHPRIV;
+               break;
 #endif
        case SYSLOG_FACILITY_LOCAL0:
                log_facility = LOG_LOCAL0;

diff --git a/log.h b/log.h
index d13f73771b8fb4e687b2337f98be2c0a220ac2d3..6da5bcc0b7d7eb2c0c7f2a24b780bf2389eb6c55 100644 (file)
--- a/log.h
+++ b/log.h
@@ -15,6 +15,8 @@
 #ifndef SSH_LOG_H
 #define SSH_LOG_H
 
+#include <syslog.h> /* Needed for LOG_AUTHPRIV (if present) */
+
 /* Supported syslog facilities and levels. */
 typedef enum {
        SYSLOG_FACILITY_DAEMON,