summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-03-20 09:15:57 +1100
committerDamien Miller <djm@mindrot.org>2001-03-20 09:15:57 +1100
commite7cf07c927e6065b1bba5199319fe80887607317 (patch)
treec29d37571c586403e4058029061c1785045d4d84 /readconf.c
parent9911f120831a46e8455d3625e2f410d0c1692621 (diff)
- markus@cvs.openbsd.org 2001/03/19 17:07:23
[auth.c readconf.c] undo /etc/shell and proto 2,1 change for openssh-2.5.2
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c
index 33d40e8c..e28ac484 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.67 2001/03/10 17:51:04 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.68 2001/03/19 17:07:23 markus Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -805,7 +805,7 @@ fill_default_options(Options * options)
/* options->ciphers, default set in myproposals.h */
/* options->macs, default set in myproposals.h */
if (options->protocol == SSH_PROTO_UNKNOWN)
- options->protocol = SSH_PROTO_1|SSH_PROTO_2;
+ options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED;
if (options->num_identity_files == 0) {
if (options->protocol & SSH_PROTO_1) {
len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1;