From cc3067d6a62e8738968b37655d95e46572e15bf0 Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Mon, 5 Mar 2001 10:23:31 +0000
Subject: [PATCH]  - (djm) Fix up LOG_AUTHPRIV for systems that have it

---
 ChangeLog |  1 +
 log.c     | 13 +++++++------
 log.h     |  2 ++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a9d760c..3d9d676b 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.
diff --git a/log.c b/log.c
index 11633fe3..6131f4cd 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 d13f7377..6da5bcc0 100644
--- 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,
-- 
2.45.1