diff --git a/ChangeLog b/ChangeLog index 5909f3be6..9c20486d1 100644 --- 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. @@ -4362,4 +4363,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.905 2001/03/05 08:16:54 mouring Exp $ +$Id: ChangeLog,v 1.906 2001/03/05 10:23:31 djm Exp $ diff --git a/log.c b/log.c index 11633fe3f..6131f4cdd 100644 --- 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 d13f73771..6da5bcc0b 100644 --- a/log.h +++ b/log.h @@ -15,6 +15,8 @@ #ifndef SSH_LOG_H #define SSH_LOG_H +#include /* Needed for LOG_AUTHPRIV (if present) */ + /* Supported syslog facilities and levels. */ typedef enum { SYSLOG_FACILITY_DAEMON,