From 5aa5d78e40da7a1f731082a6b3b1e0b97dbe4da0 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 8 Feb 2002 22:01:54 +1100 Subject: - (djm) OpenBSD CVS Sync - markus@cvs.openbsd.org 2002/02/04 12:15:25 [sshd.c] add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1, fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@ --- ChangeLog | 9 ++++++++- sshd.c | 8 +++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0fb2e84b4..3a123c3e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +20020208 + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2002/02/04 12:15:25 + [sshd.c] + add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1, + fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@ + 20020205 - (djm) Cleanup after sync: - :%s/reverse_mapping_check/verify_reverse_mapping/g @@ -7503,4 +7510,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1827 2002/02/05 01:40:46 djm Exp $ +$Id: ChangeLog,v 1.1828 2002/02/08 11:01:54 djm Exp $ diff --git a/sshd.c b/sshd.c index 2ecf18cde..fc07f9264 100644 --- a/sshd.c +++ b/sshd.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.223 2002/01/13 17:57:37 markus Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.224 2002/02/04 12:15:25 markus Exp $"); #include #include @@ -709,8 +709,10 @@ main(int ac, char **av) * key (unless started from inetd) */ log_init(__progname, - options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level, - options.log_facility == -1 ? SYSLOG_FACILITY_AUTH : options.log_facility, + options.log_level == SYSLOG_LEVEL_NOT_SET ? + SYSLOG_LEVEL_INFO : options.log_level, + options.log_facility == SYSLOG_FACILITY_NOT_SET ? + SYSLOG_FACILITY_AUTH : options.log_facility, !inetd_flag); #ifdef _CRAY -- cgit v1.2.3