diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2000-04-07 09:17:40 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2000-04-07 09:17:40 +0000 |
| commit | edd2944b18e156036ee770eff165021752ae518a (patch) | |
| tree | 9493196af47b71cded8cc760f6772594addc2137 | |
| parent | 545c717748d6028ad609f488acb2d17dec8cb46f (diff) | |
interop w/ latest ssh.com windows client.
| -rw-r--r-- | usr.bin/ssh/compat.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/ssh/compat.c b/usr.bin/ssh/compat.c index a9a3e755e28..c4bc676e5c2 100644 --- 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 40d2aa6d4ac..a22396cfdef 100644 --- 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)); |