- markus@cvs.openbsd.org 2001/03/10 12:48:27

     [sshconnect2.c]
     ignore nonexisting private keys; report rjmooney@mediaone.net

diff --git a/ChangeLog b/ChangeLog
index 4b5c54014ba836d54d5bc87c6c01018bfe1a89ab..d4c6453d4cfcf5a94f09e4245e4afdd3ffcdddc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20010311
+ - OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2001/03/10 12:48:27
+     [sshconnect2.c]
+     ignore nonexisting private keys; report rjmooney@mediaone.net
+
 20010310
  - OpenBSD CVS Sync
    - deraadt@cvs.openbsd.org 2001/03/09 03:14:39
@@ -4468,4 +4474,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.933 2001/03/09 19:48:37 mouring Exp $
+$Id: ChangeLog,v 1.934 2001/03/10 17:08:59 mouring Exp $

diff --git a/sshconnect2.c b/sshconnect2.c
index 81e1aef930725436da7682971c43efd7f1ecb09a..646bb18f326b50e7cb2f7a115833fa6efd6f9e86 100644 (file)
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.51 2001/03/08 21:42:33 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.52 2001/03/10 12:48:27 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/md5.h>
@@ -895,7 +895,12 @@ load_identity_file(char *filename)
        Key *private;
        char prompt[300], *passphrase;
        int success = 0, quit, i;
+       struct stat st;
 
+       if (stat(filename, &st) < 0) {
+               debug3("no such identity: %s", filename);
+               return NULL;
+       }
        private = key_new(KEY_UNSPEC);
        if (!load_private_key(filename, "", private, NULL)) {
                if (options.batch_mode) {