summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 45c1ba5e6..3fec85f36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
16 - jmc@cvs.openbsd.org 2004/04/19 16:12:14 16 - jmc@cvs.openbsd.org 2004/04/19 16:12:14
17 [ssh_config.5] 17 [ssh_config.5]
18 kill whitespace at eol; 18 kill whitespace at eol;
19 - djm@cvs.openbsd.org 2004/04/19 21:51:49
20 [ssh.c]
21 fix idiot typo that i introduced in my last commit;
22 spotted by cschneid AT cschneid.com
19 - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for above change 23 - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for above change
20 24
2120040419 2520040419
@@ -1021,4 +1025,4 @@
1021 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1025 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1022 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1026 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1023 1027
1024$Id: ChangeLog,v 1.3326 2004/04/20 10:13:32 djm Exp $ 1028$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 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.210 2004/04/18 23:10:26 djm Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.211 2004/04/19 21:51:49 djm Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -526,7 +526,7 @@ again:
526 * file if the user specifies a config file on the command line. 526 * file if the user specifies a config file on the command line.
527 */ 527 */
528 if (config != NULL) { 528 if (config != NULL) {
529 if (!read_config_file(config, host, &options, 0), 0) 529 if (!read_config_file(config, host, &options, 0))
530 fatal("Can't open user config file %.100s: " 530 fatal("Can't open user config file %.100s: "
531 "%.100s", config, strerror(errno)); 531 "%.100s", config, strerror(errno));
532 } else { 532 } else {