- (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@.
This commit is contained in:
Darren Tucker 2008-02-28 23:20:48 +11:00
parent 0f26b1386a
commit 1f1e17bd61
2 changed files with 8 additions and 3 deletions

View File

@ -11,6 +11,9 @@
getgrouplist via getgrset on AIX, rather than iterating over getgrent. getgrouplist via getgrset on AIX, rather than iterating over getgrent.
This allows, eg, Match and AllowGroups directives to work with NIS and This allows, eg, Match and AllowGroups directives to work with NIS and
LDAP groups. 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 20080225
- (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack
@ -3641,4 +3644,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4845 2008/02/28 12:16:04 dtucker Exp $ $Id: ChangeLog,v 1.4846 2008/02/28 12:20:48 dtucker Exp $

6
sshd.c
View File

@ -122,8 +122,8 @@
#ifdef LIBWRAP #ifdef LIBWRAP
#include <tcpd.h> #include <tcpd.h>
#include <syslog.h> #include <syslog.h>
int allow_severity = LOG_INFO; int allow_severity;
int deny_severity = LOG_WARNING; int deny_severity;
#endif /* LIBWRAP */ #endif /* LIBWRAP */
#ifndef O_NOCTTY #ifndef O_NOCTTY
@ -1747,6 +1747,8 @@ main(int ac, char **av)
audit_connection_from(remote_ip, remote_port); audit_connection_from(remote_ip, remote_port);
#endif #endif
#ifdef LIBWRAP #ifdef LIBWRAP
allow_severity = options.log_facility|LOG_INFO;
deny_severity = options.log_facility|LOG_WARNING;
/* Check whether logins are denied from this host. */ /* Check whether logins are denied from this host. */
if (packet_connection_is_on_socket()) { if (packet_connection_is_on_socket()) {
struct request_info req; struct request_info req;