diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readconf.c | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -46,6 +46,9 @@ | |||
46 | fake_session_key = dig1|dig2; | 46 | fake_session_key = dig1|dig2; |
47 | this change is caused by a mail from anakin@pobox.com | 47 | this change is caused by a mail from anakin@pobox.com |
48 | patch based on discussions with my german advisor niels@openbsd.org | 48 | patch based on discussions with my german advisor niels@openbsd.org |
49 | - deraadt@cvs.openbsd.org 2001/02/24 10:37:55 | ||
50 | [readconf.c] | ||
51 | look for id_rsa by default, before id_dsa | ||
49 | 52 | ||
50 | 20010304 | 53 | 20010304 |
51 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. | 54 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. |
@@ -4238,4 +4241,4 @@ | |||
4238 | - Wrote replacements for strlcpy and mkdtemp | 4241 | - Wrote replacements for strlcpy and mkdtemp |
4239 | - Released 1.0pre1 | 4242 | - Released 1.0pre1 |
4240 | 4243 | ||
4241 | $Id: ChangeLog,v 1.864 2001/03/05 06:00:29 mouring Exp $ | 4244 | $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 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.62 2001/02/11 12:59:25 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.63 2001/02/24 10:37:55 deraadt Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -808,6 +808,12 @@ fill_default_options(Options * options) | |||
808 | len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY); | 808 | len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY); |
809 | } | 809 | } |
810 | if (options->protocol & SSH_PROTO_2) { | 810 | if (options->protocol & SSH_PROTO_2) { |
811 | len = 2 + strlen(_PATH_SSH_CLIENT_ID_RSA) + 1; | ||
812 | options->identity_files[options->num_identity_files] = | ||
813 | xmalloc(len); | ||
814 | snprintf(options->identity_files[options->num_identity_files++], | ||
815 | len, "~/%.100s", _PATH_SSH_CLIENT_ID_RSA); | ||
816 | |||
811 | len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1; | 817 | len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1; |
812 | options->identity_files[options->num_identity_files] = | 818 | options->identity_files[options->num_identity_files] = |
813 | xmalloc(len); | 819 | xmalloc(len); |