summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-05 06:03:03 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-05 06:03:03 +0000
commitb00d4fb1426fa6ac3c1e2ca78ee40e5f0e1d5d15 (patch)
tree98da4faef9e21631b78d2179e34de8c601be5f36 /readconf.c
parenteb648a749b3fb49c57167877ccc5f0ca8085cfcb (diff)
- deraadt@cvs.openbsd.org 2001/02/24 10:37:55
[readconf.c] look for id_rsa by default, before id_dsa
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c
index 3ac86ea0..7cce9231 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);