interop w/ latest ssh.com windows client.

diff --git a/usr.bin/ssh/compat.c b/usr.bin/ssh/compat.c
index a9a3e75..c4bc676 100644 (file)
--- a/usr.bin/ssh/compat.c
+++ b/usr.bin/ssh/compat.c
@@ -28,7 +28,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: compat.c,v 1.7 2000/04/04 15:19:42 markus Exp $");
+RCSID("$Id: compat.c,v 1.8 2000/04/07 09:17:39 markus Exp $");
 
 #include "ssh.h"
 #include "packet.h"
@@ -58,9 +58,7 @@ compat_datafellows(const char *version)
        size_t len;
        static const char *check[] = {
                "2.0.1",
-               "2.1.0.beta.9",
-               "2.1.0.pre.3",
-               "2.1.0.public.beta.1",
+               "2.1.0",
                NULL
        };
        for (i = 0; check[i]; i++) {

diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 40d2aa6..a22396c 100644 (file)
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.98 2000/04/06 08:55:22 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.99 2000/04/07 09:17:39 markus Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -341,12 +341,15 @@ sshd_exchange_identification(int sock_in, int sock_out)
                        /* note that this disables agent-forwarding */
                        enable_compat13();
                }
-               break;
+               if (remote_minor != 99)
+                      break;
+               /* FALLTHROUGH */
        case 2:
                if (allow_ssh2) {
                        enable_compat20();
                        break;
                }
+               /* FALLTHROUGH */
        default: 
                s = "Protocol major versions differ.\n";
                (void) atomicio(write, sock_out, s, strlen(s));