- OpenBSD CVS Sync

   - markus@cvs.openbsd.org 2001/03/20 19:10:16
     [readconf.c]
     default to SSH protocol version 2

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 95d67e14c..c728afc23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
  - (bal) version.c CVS ID resync
  - (bal) auth-chall.c auth-passwd.c auth.h auth1.c auth2.c session.c CVS ID
    resync
+ - OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2001/03/20 19:10:16
+     [readconf.c]
+     default to SSH protocol version 2
 
 20010321
  - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve 
@@ -4662,4 +4666,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1001 2001/03/22 01:22:03 mouring Exp $
+$Id: ChangeLog,v 1.1002 2001/03/22 01:24:04 mouring Exp $
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;