summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ssh.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f53fa055b..d7180176e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
15 - markus@cvs.openbsd.org 2013/02/22 19:13:56 15 - markus@cvs.openbsd.org 2013/02/22 19:13:56
16 [sshconnect.c] 16 [sshconnect.c]
17 support ProxyCommand=- (stdin/out already point to the proxy); ok djm@ 17 support ProxyCommand=- (stdin/out already point to the proxy); ok djm@
18 - djm@cvs.openbsd.org 2013/02/22 22:09:01
19 [ssh.c]
20 Allow IdenityFile=none; ok markus deraadt (and dtucker for an earlier
21 version)
18 22
1920130401 2320130401
20 - (dtucker) [openbsd-compat/bsd-cygwin_util.{c,h}] Don't include windows.h 24 - (dtucker) [openbsd-compat/bsd-cygwin_util.{c,h}] Don't include windows.h
diff --git a/ssh.c b/ssh.c
index 5d3f492f0..5ec89f2cc 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.372 2013/02/22 04:45:09 dtucker Exp $ */ 1/* $OpenBSD: ssh.c,v 1.373 2013/02/22 22:09:01 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1536,7 +1536,8 @@ load_public_identity_files(void)
1536 fatal("load_public_identity_files: gethostname: %s", 1536 fatal("load_public_identity_files: gethostname: %s",
1537 strerror(errno)); 1537 strerror(errno));
1538 for (i = 0; i < options.num_identity_files; i++) { 1538 for (i = 0; i < options.num_identity_files; i++) {
1539 if (n_ids >= SSH_MAX_IDENTITY_FILES) { 1539 if (n_ids >= SSH_MAX_IDENTITY_FILES ||
1540 strcasecmp(options.identity_files[i], "none") == 0) {
1540 xfree(options.identity_files[i]); 1541 xfree(options.identity_files[i]);
1541 continue; 1542 continue;
1542 } 1543 }