===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/readconf.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- src/usr.bin/ssh/readconf.c	2000/04/26 20:56:29	1.27
+++ src/usr.bin/ssh/readconf.c	2000/04/26 22:43:14	1.28
@@ -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 @@
 	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);