tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2007/09/13 04:39:04 

[sftp-server.c]
     fix incorrect test when setting syslog facility; from Jan Pechanec
This commit is contained in:
Damien Miller 2007-09-17 16:11:33 +10:00
parent 83e04f2023
commit 35e18dba89
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -52,6 +52,9 @@
- stevesk@cvs.openbsd.org 2007/09/12 19:39:19 - stevesk@cvs.openbsd.org 2007/09/12 19:39:19
[umac.c] [umac.c]
use xmalloc() and xfree(); ok markus@ pvalchev@ 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 20070914
- (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path. - (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 OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ 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 $

4
sftp-server.c
View File

@ -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. * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
* *
@ -1244,7 +1244,7 @@ main(int argc, char **argv)
break; break;
case 'f': case 'f':
log_facility = log_facility_number(optarg); 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); error("Invalid log facility \"%s\"", optarg);
break; break;
case 'h': case 'h':