ssh/sshd default to proto 1 and 2

diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index eac514e..1e30bc8 100644 (file)
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/readconf.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: readconf.c,v 1.27 2000/04/26 20:56:29 markus Exp $");
+RCSID("$Id: readconf.c,v 1.28 2000/04/26 22:43:14 markus Exp $");
 
 #include "ssh.h"
 #include "cipher.h"
@@ -738,7 +738,7 @@ fill_default_options(Options * options)
        if (options->cipher == -1)
                options->cipher = SSH_CIPHER_NOT_SET;
        if (options->protocol == SSH_PROTO_UNKNOWN)
-               options->protocol = SSH_PROTO_1;
+               options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED;
        if (options->num_identity_files == 0) {
                options->identity_files[0] =
                        xmalloc(2 + strlen(SSH_CLIENT_IDENTITY) + 1);

diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c
index 75ce330..ad4f627 100644 (file)
--- a/usr.bin/ssh/servconf.c
+++ b/usr.bin/ssh/servconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: servconf.c,v 1.34 2000/04/14 10:30:33 markus Exp $");
+RCSID("$Id: servconf.c,v 1.35 2000/04/26 22:43:15 markus Exp $");
 
 #include "ssh.h"
 #include "servconf.h"
@@ -143,7 +143,7 @@ fill_default_server_options(ServerOptions *options)
        if (options->use_login == -1)
                options->use_login = 0;
        if (options->protocol == SSH_PROTO_UNKNOWN)
-               options->protocol = SSH_PROTO_1;
+               options->protocol = SSH_PROTO_1|SSH_PROTO_2;
 }
 
 #define WHITESPACE " \t\r\n"