summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2007-09-17 16:11:33 +1000
committerDamien Miller <djm@mindrot.org>2007-09-17 16:11:33 +1000
commit35e18dba89ac0fd068f16388563861dccbeb527c (patch)
treeb94c40f27747f17acc6eb7779eba383e31c6f616
parent83e04f2023cb80366cf4f06a43f4df6ad2b5f08b (diff)
- djm@cvs.openbsd.org 2007/09/13 04:39:04
[sftp-server.c] fix incorrect test when setting syslog facility; from Jan Pechanec
-rw-r--r--ChangeLog5
-rw-r--r--sftp-server.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f0ae35d62..7a2d72806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,9 @@
52 - stevesk@cvs.openbsd.org 2007/09/12 19:39:19 52 - stevesk@cvs.openbsd.org 2007/09/12 19:39:19
53 [umac.c] 53 [umac.c]
54 use xmalloc() and xfree(); ok markus@ pvalchev@ 54 use xmalloc() and xfree(); ok markus@ pvalchev@
55 - djm@cvs.openbsd.org 2007/09/13 04:39:04
56 [sftp-server.c]
57 fix incorrect test when setting syslog facility; from Jan Pechanec
55 58
5620070914 5920070914
57 - (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path. 60 - (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path.
@@ -3249,4 +3252,4 @@
3249 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3252 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3250 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3253 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3251 3254
3252$Id: ChangeLog,v 1.4754 2007/09/17 06:11:01 djm Exp $ 3255$Id: ChangeLog,v 1.4755 2007/09/17 06:11:33 djm Exp $
diff --git a/sftp-server.c b/sftp-server.c
index 76edebc5a..ee0b4a62e 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-server.c,v 1.73 2007/05/17 07:55:29 djm Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.74 2007/09/13 04:39:04 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
4 * 4 *
@@ -1244,7 +1244,7 @@ main(int argc, char **argv)
1244 break; 1244 break;
1245 case 'f': 1245 case 'f':
1246 log_facility = log_facility_number(optarg); 1246 log_facility = log_facility_number(optarg);
1247 if (log_level == SYSLOG_FACILITY_NOT_SET) 1247 if (log_facility == SYSLOG_FACILITY_NOT_SET)
1248 error("Invalid log facility \"%s\"", optarg); 1248 error("Invalid log facility \"%s\"", optarg);
1249 break; 1249 break;
1250 case 'h': 1250 case 'h':