3 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index d4c6453d4..b252511ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - markus@cvs.openbsd.org 2001/03/10 12:48:27
      [sshconnect2.c]
      ignore nonexisting private keys; report rjmooney@mediaone.net
+   - deraadt@cvs.openbsd.org 2001/03/10 12:53:51
+     [readconf.c ssh_config]
+     default to SSH2, now that m68k runs fast
 
 20010310
  - OpenBSD CVS Sync
@@ -4474,4 +4477,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.934 2001/03/10 17:08:59 mouring Exp $
+$Id: ChangeLog,v 1.935 2001/03/10 17:15:39 mouring Exp $
diff --git a/readconf.c b/readconf.c
index 948d7eddf..2b2981476 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;
diff --git a/ssh_config b/ssh_config
index cfaf2313f..e3faa7709 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh_config,v 1.8 2001/02/02 12:57:51 deraadt Exp $
+#       $OpenBSD: ssh_config,v 1.9 2001/03/10 12:53:51 deraadt Exp $
 
 # This is ssh client systemwide configuration file.  See ssh(1) for more
 # information.  This file provides defaults for users, and the values can
@@ -31,6 +31,6 @@
 #   IdentityFile ~/.ssh/id_rsa1
 #   IdentityFile ~/.ssh/id_rsa2
 #   Port 22
-#   Protocol 1,2
+#   Protocol 2,1
 #   Cipher blowfish
 #   EscapeChar ~