diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | sshd.c | 8 |
2 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,10 @@ | |||
1 | 20020208 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - markus@cvs.openbsd.org 2002/02/04 12:15:25 | ||
4 | [sshd.c] | ||
5 | add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1, | ||
6 | fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@ | ||
7 | |||
1 | 20020205 | 8 | 20020205 |
2 | - (djm) Cleanup after sync: | 9 | - (djm) Cleanup after sync: |
3 | - :%s/reverse_mapping_check/verify_reverse_mapping/g | 10 | - :%s/reverse_mapping_check/verify_reverse_mapping/g |
@@ -7503,4 +7510,4 @@ | |||
7503 | - Wrote replacements for strlcpy and mkdtemp | 7510 | - Wrote replacements for strlcpy and mkdtemp |
7504 | - Released 1.0pre1 | 7511 | - Released 1.0pre1 |
7505 | 7512 | ||
7506 | $Id: ChangeLog,v 1.1827 2002/02/05 01:40:46 djm Exp $ | 7513 | $Id: ChangeLog,v 1.1828 2002/02/08 11:01:54 djm Exp $ |
@@ -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 |