summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshd.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-04-07 09:17:40 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-04-07 09:17:40 +0000
commitedd2944b18e156036ee770eff165021752ae518a (patch)
tree9493196af47b71cded8cc760f6772594addc2137 /usr.bin/ssh/sshd.c
parent545c717748d6028ad609f488acb2d17dec8cb46f (diff)
interop w/ latest ssh.com windows client.
Diffstat (limited to 'usr.bin/ssh/sshd.c')
-rw-r--r--usr.bin/ssh/sshd.c7
1 files changed, 5 insertions, 2 deletions
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));