- markus@cvs.openbsd.org 2004/03/05 10:53:58

     [readconf.c readconf.h scp.1 sftp.1 ssh.1 ssh_config.5 sshconnect2.c]
     add IdentitiesOnly; ok djm@, pb@

1 files changed, 2 insertions, 2 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index 3a218113c..c261dfd18 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.134 2004/01/19 21:25:15 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.135 2004/03/05 10:53:58 markus Exp $");
 
 #include "openbsd-compat/sys-queue.h"
 
@@ -1044,7 +1044,7 @@ pubkey_prepare(Authctxt *authctxt)
                                         break;
                                 }
                         }
-                        if (!found) {
+                        if (!found && !options.identities_only) {
                                 id = xmalloc(sizeof(*id));
                                 memset(id, 0, sizeof(*id));
                                 id->key = key;