[openssh-commits] [openssh] 10/14: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 9e9c4a7e57b96ab29fe6d7545ed09d2e5bddbdec
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Tue Jan 23 05:12:12 2018 +0000

    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
---
 sshd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sshd.c b/sshd.c
index 858dd45a..6133135d 100644
--- 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.