upstream commit

remove compat20/compat13/compat15 variables

ok markus@

Upstream-ID: 43802c035ceb3fef6c50c400e4ecabf12354691c

1 files changed, 3 insertions, 5 deletions

diff --git a/sshd.c b/sshd.c
index 197c4ec8e..d18da6bdf 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.485 2017/03/15 03:52:30 deraadt Exp $ */
+/* $OpenBSD: sshd.c,v 1.486 2017/04/30 23:13:25 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -450,10 +450,8 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
         chop(server_version_string);
         debug("Local version string %.200s", server_version_string);
 
-        if (remote_major == 2 ||
-            (remote_major == 1 && remote_minor == 99)) {
-                enable_compat20();
-        } else {
+        if (remote_major != 2 ||
+            (remote_major == 1 && remote_minor != 99)) {
                 s = "Protocol major versions differ.\n";
                 (void) atomicio(vwrite, sock_out, s, strlen(s));
                 close(sock_in);