summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c8
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 @@
1/* $OpenBSD: sshd.c,v 1.485 2017/03/15 03:52:30 deraadt Exp $ */ 1/* $OpenBSD: sshd.c,v 1.486 2017/04/30 23:13:25 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * 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)
450 chop(server_version_string); 450 chop(server_version_string);
451 debug("Local version string %.200s", server_version_string); 451 debug("Local version string %.200s", server_version_string);
452 452
453 if (remote_major == 2 || 453 if (remote_major != 2 ||
454 (remote_major == 1 && remote_minor == 99)) { 454 (remote_major == 1 && remote_minor != 99)) {
455 enable_compat20();
456 } else {
457 s = "Protocol major versions differ.\n"; 455 s = "Protocol major versions differ.\n";
458 (void) atomicio(vwrite, sock_out, s, strlen(s)); 456 (void) atomicio(vwrite, sock_out, s, strlen(s));
459 close(sock_in); 457 close(sock_in);