diff --git a/ChangeLog b/ChangeLog index 45c1ba5e6..3fec85f36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,10 @@ - jmc@cvs.openbsd.org 2004/04/19 16:12:14 [ssh_config.5] kill whitespace at eol; + - djm@cvs.openbsd.org 2004/04/19 21:51:49 + [ssh.c] + fix idiot typo that i introduced in my last commit; + spotted by cschneid AT cschneid.com - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for above change 20040419 @@ -1021,4 +1025,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3326 2004/04/20 10:13:32 djm Exp $ +$Id: ChangeLog,v 1.3327 2004/04/20 10:14:07 djm Exp $ diff --git a/ssh.c b/ssh.c index 53d7f0f56..9658e4afc 100644 --- a/ssh.c +++ b/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.210 2004/04/18 23:10:26 djm Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.211 2004/04/19 21:51:49 djm Exp $"); #include #include @@ -526,7 +526,7 @@ again: * file if the user specifies a config file on the command line. */ if (config != NULL) { - if (!read_config_file(config, host, &options, 0), 0) + if (!read_config_file(config, host, &options, 0)) fatal("Can't open user config file %.100s: " "%.100s", config, strerror(errno)); } else {