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

diff --git a/sshd.c b/sshd.c
index 858dd45a850d6b5b44a758f879b23a0097680eca..6133135db878fd61f81cbe1ad339c14e77165558 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -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);