- Merge big update to OpenSSH-2.0 from OpenBSD CVS

[openssh.git] / servconf.c

diff --git a/servconf.c b/servconf.c
index 5cf6416ca2b25886dd94496ad523f5b68d763e53..21123144dfd079b5064afe2b9553883b7ff2ed70 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -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"