summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/readconf.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-05-02 22:18:05 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-05-02 22:18:05 +0000
commita6c68cea78a64195f2f8e29c2d4f6227293a9e96 (patch)
tree1a1213a3631edef5f8fc21fc5f9e885b9963e2ce /usr.bin/ssh/readconf.c
parent8aa0a8a6f34e9ba651a3a655111681dc19d9e698 (diff)
default DSA key file ~/.ssh/id_dsa
Diffstat (limited to 'usr.bin/ssh/readconf.c')
-rw-r--r--usr.bin/ssh/readconf.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index 1e30bc830d4..0271ba99a76 100644
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/readconf.c
@@ -14,7 +14,7 @@
*/
#include "includes.h"
-RCSID("$Id: readconf.c,v 1.28 2000/04/26 22:43:14 markus Exp $");
+RCSID("$Id: readconf.c,v 1.29 2000/05/02 22:18:04 markus Exp $");
#include "ssh.h"
#include "cipher.h"
@@ -745,14 +745,12 @@ fill_default_options(Options * options)
sprintf(options->identity_files[0], "~/%.100s", SSH_CLIENT_IDENTITY);
options->num_identity_files = 1;
}
-#if 0
if (options->num_identity_files2 == 0) {
options->identity_files2[0] =
- xmalloc(2 + strlen(SSH2_CLIENT_IDENTITY) + 1);
- sprintf(options->identity_files2[0], "~/%.100s", SSH2_CLIENT_IDENTITY);
+ xmalloc(2 + strlen(SSH_CLIENT_ID_DSA) + 1);
+ sprintf(options->identity_files2[0], "~/%.100s", SSH_CLIENT_ID_DSA);
options->num_identity_files2 = 1;
}
-#endif
if (options->escape_char == -1)
options->escape_char = '~';
if (options->system_hostfile == NULL)