diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-01-23 06:12:12 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-01-23 06:40:28 +0100 |
| commit | 9e9c4a7e57b96ab29fe6d7545ed09d2e5bddbdec (patch) | |
| tree | 6874a716ee6bcad3ef12cba01d9ed1d2d8428eaf /sshd.c | |
| parent | upstream commit (diff) | |
| download | openssh-9e9c4a7e57b96ab29fe6d7545ed09d2e5bddbdec.tar.xz openssh-9e9c4a7e57b96ab29fe6d7545ed09d2e5bddbdec.zip | |
upstream commit
unbreak support for clients that advertise a protocol
version of "1.99" (indicating both v2 and v1 support). Busted by me during
SSHv1 purge in r1.358; bz2810, ok dtucker
OpenBSD-Commit-ID: e8f9c2bee11afc16c872bb79d6abe9c555bd0e4b
Diffstat (limited to '')
| -rw-r--r-- | sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.500 2018/01/23 05:01:15 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.501 2018/01/23 05:12:12 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -455,7 +455,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) debug("Local version string %.200s", server_version_string); if (remote_major != 2 || - (remote_major == 1 && remote_minor != 99)) { + !(remote_major == 1 && remote_minor == 99)) { s = "Protocol major versions differ.\n"; (void) atomicio(vwrite, sock_out, s, strlen(s)); close(sock_in); |