- dtucker@cvs.openbsd.org 2013/02/17 23:16:57

     [readconf.c ssh.c readconf.h sshconnect2.c]
     Keep track of which IndentityFile options were manually supplied and which
     were default options, and don't warn if the latter are missing.
     ok markus@

1 files changed, 2 insertions, 7 deletions

diff --git a/ssh.c b/ssh.c
index 3f61eb028..8a7aea09f 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.370 2012/07/06 01:47:38 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.371 2013/02/17 23:16:57 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -405,12 +405,7 @@ main(int ac, char **av)
                                     strerror(errno));
                                 break;
                         }
-                        if (options.num_identity_files >=
-                            SSH_MAX_IDENTITY_FILES)
-                                fatal("Too many identity files specified "
-                                    "(max %d)", SSH_MAX_IDENTITY_FILES);
-                        options.identity_files[options.num_identity_files++] =
-                            xstrdup(optarg);
+                        add_identity_file(&options, NULL, optarg, 1);
                         break;
                 case 'I':
 #ifdef ENABLE_PKCS11