summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-10 17:15:39 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-10 17:15:39 +0000
commit068f3dce2885753160f162d7edf1c4b4b1c434ac (patch)
tree20300e69e71f707ef6a96e0ebef9f394b1bc7181 /readconf.c
parent329782e3db938e8cc062a600133a98010d95a662 (diff)
- deraadt@cvs.openbsd.org 2001/03/10 12:53:51
[readconf.c ssh_config] default to SSH2, now that m68k runs fast
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 948d7edd..2b298147 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.65 2001/03/08 00:15:47 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.66 2001/03/10 12:53:52 deraadt Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -798,7 +798,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;