From 5c7fd4ce3b4dfa1906fb6c1d720c76fe2b5017b5 Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Thu, 28 Feb 2008 12:20:48 +0000
Subject: [PATCH]  - (dtucker) [sshd.c] Bug #1042: make log messages for
 tcpwrappers use the    same SyslogFacility as the rest of sshd.  Patch from
 William Knox,    ok djm@.

---
 ChangeLog | 3 +++
 sshd.c    | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 376d8a82..68941603 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
    getgrouplist via getgrset on AIX, rather than iterating over getgrent.
    This allows, eg, Match and AllowGroups directives to work with NIS and
    LDAP groups.
+ - (dtucker) [sshd.c] Bug #1042: make log messages for tcpwrappers use the
+   same SyslogFacility as the rest of sshd.  Patch from William Knox,
+   ok djm@.
 
 20080225
  - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack
diff --git a/sshd.c b/sshd.c
index 9144bbae..345ee431 100644
--- a/sshd.c
+++ b/sshd.c
@@ -122,8 +122,8 @@
 #ifdef LIBWRAP
 #include <tcpd.h>
 #include <syslog.h>
-int allow_severity = LOG_INFO;
-int deny_severity = LOG_WARNING;
+int allow_severity;
+int deny_severity;
 #endif /* LIBWRAP */
 
 #ifndef O_NOCTTY
@@ -1747,6 +1747,8 @@ main(int ac, char **av)
 	audit_connection_from(remote_ip, remote_port);
 #endif
 #ifdef LIBWRAP
+	allow_severity = options.log_facility|LOG_INFO;
+	deny_severity = options.log_facility|LOG_WARNING;
 	/* Check whether logins are denied from this host. */
 	if (packet_connection_is_on_socket()) {
 		struct request_info req;
-- 
2.45.1