From 35e18dba89ac0fd068f16388563861dccbeb527c Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 17 Sep 2007 16:11:33 +1000 Subject: - djm@cvs.openbsd.org 2007/09/13 04:39:04 [sftp-server.c] fix incorrect test when setting syslog facility; from Jan Pechanec --- ChangeLog | 5 ++++- sftp-server.c | 4 ++-- 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 @@ - stevesk@cvs.openbsd.org 2007/09/12 19:39:19 [umac.c] use xmalloc() and xfree(); ok markus@ pvalchev@ + - djm@cvs.openbsd.org 2007/09/13 04:39:04 + [sftp-server.c] + fix incorrect test when setting syslog facility; from Jan Pechanec 20070914 - (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path. @@ -3249,4 +3252,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4754 2007/09/17 06:11:01 djm Exp $ +$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 @@ -/* $OpenBSD: sftp-server.c,v 1.73 2007/05/17 07:55:29 djm Exp $ */ +/* $OpenBSD: sftp-server.c,v 1.74 2007/09/13 04:39:04 djm Exp $ */ /* * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * @@ -1244,7 +1244,7 @@ main(int argc, char **argv) break; case 'f': log_facility = log_facility_number(optarg); - if (log_level == SYSLOG_FACILITY_NOT_SET) + if (log_facility == SYSLOG_FACILITY_NOT_SET) error("Invalid log facility \"%s\"", optarg); break; case 'h': -- cgit v1.2.3