diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-22 02:24:04 +0100 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-22 02:24:04 +0100 |
commit | 6b77643fd58f697d68f6f99bfa345e0197e909c6 (patch) | |
tree | cfcb653af83b1953f4300db8624cdec2866e83ef /readconf.c | |
parent | - (bal) auth-chall.c auth-passwd.c auth.h auth1.c auth2.c session.c CVS ID (diff) | |
download | openssh-6b77643fd58f697d68f6f99bfa345e0197e909c6.tar.xz openssh-6b77643fd58f697d68f6f99bfa345e0197e909c6.zip |
- OpenBSD CVS Sync
- markus@cvs.openbsd.org 2001/03/20 19:10:16
[readconf.c]
default to SSH protocol version 2
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c index e28ac484b..bb2f2c0e0 100644 --- a/readconf.c +++ b/readconf.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: readconf.c,v 1.68 2001/03/19 17:07:23 markus Exp $"); +RCSID("$OpenBSD: readconf.c,v 1.69 2001/03/20 19:10:16 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|SSH_PROTO_1_PREFERRED; + options->protocol = SSH_PROTO_1|SSH_PROTO_2; if (options->num_identity_files == 0) { if (options->protocol & SSH_PROTO_1) { len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1; |