2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 333decb49..986cfa243 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,9 @@
              fake_session_key = dig1|dig2;
      this change is caused by a mail from anakin@pobox.com
      patch based on discussions with my german advisor niels@openbsd.org
+   - deraadt@cvs.openbsd.org 2001/02/24 10:37:55
+     [readconf.c]
+     look for id_rsa by default, before id_dsa
 
 20010304
  - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4238,4 +4241,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.864 2001/03/05 06:00:29 mouring Exp $
+$Id: ChangeLog,v 1.865 2001/03/05 06:03:03 mouring Exp $
diff --git a/readconf.c b/readconf.c
index 3ac86ea06..7cce92310 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.62 2001/02/11 12:59:25 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.63 2001/02/24 10:37:55 deraadt Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -808,6 +808,12 @@ fill_default_options(Options * options)
                             len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY);
                 }
                 if (options->protocol & SSH_PROTO_2) {
+                        len = 2 + strlen(_PATH_SSH_CLIENT_ID_RSA) + 1;
+                        options->identity_files[options->num_identity_files] =
+                            xmalloc(len);
+                        snprintf(options->identity_files[options->num_identity_files++],
+                            len, "~/%.100s", _PATH_SSH_CLIENT_ID_RSA);
+
                         len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1;
                         options->identity_files[options->num_identity_files] =
                             xmalloc(len);