- djm@cvs.openbsd.org 2013/02/22 22:09:01

     [ssh.c]
     Allow IdenityFile=none; ok markus deraadt (and dtucker for an earlier
     version)

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 @@
    - markus@cvs.openbsd.org 2013/02/22 19:13:56
      [sshconnect.c]
      support ProxyCommand=- (stdin/out already point to the proxy); ok djm@
+   - djm@cvs.openbsd.org 2013/02/22 22:09:01
+     [ssh.c]
+     Allow IdenityFile=none; ok markus deraadt (and dtucker for an earlier
+     version)
 
 20130401
  - (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 @@
-/* $OpenBSD: ssh.c,v 1.372 2013/02/22 04:45:09 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.373 2013/02/22 22:09:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1536,7 +1536,8 @@ load_public_identity_files(void)
                 fatal("load_public_identity_files: gethostname: %s",
                     strerror(errno));
         for (i = 0; i < options.num_identity_files; i++) {
-                if (n_ids >= SSH_MAX_IDENTITY_FILES) {
+                if (n_ids >= SSH_MAX_IDENTITY_FILES ||
+                    strcasecmp(options.identity_files[i], "none") == 0) {
                         xfree(options.identity_files[i]);
                         continue;
                 }