diff options
author | Damien Miller <djm@mindrot.org> | 2002-02-08 22:01:54 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-02-08 22:01:54 +1100 |
commit | 5aa5d78e40da7a1f731082a6b3b1e0b97dbe4da0 (patch) | |
tree | 75af0ee503124c64d74727f82e59a6418eff5fd2 /sshd.c | |
parent | f3451a21819fbcf7a598d202f19329e03e2e5286 (diff) |
- (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@
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.223 2002/01/13 17:57:37 markus Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.224 2002/02/04 12:15:25 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/dh.h> | 45 | #include <openssl/dh.h> |
46 | #include <openssl/bn.h> | 46 | #include <openssl/bn.h> |
@@ -709,8 +709,10 @@ main(int ac, char **av) | |||
709 | * key (unless started from inetd) | 709 | * key (unless started from inetd) |
710 | */ | 710 | */ |
711 | log_init(__progname, | 711 | log_init(__progname, |
712 | options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level, | 712 | options.log_level == SYSLOG_LEVEL_NOT_SET ? |
713 | options.log_facility == -1 ? SYSLOG_FACILITY_AUTH : options.log_facility, | 713 | SYSLOG_LEVEL_INFO : options.log_level, |
714 | options.log_facility == SYSLOG_FACILITY_NOT_SET ? | ||
715 | SYSLOG_FACILITY_AUTH : options.log_facility, | ||
714 | !inetd_flag); | 716 | !inetd_flag); |
715 | 717 | ||
716 | #ifdef _CRAY | 718 | #ifdef _CRAY |