diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-04-30 23:13:25 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-01 09:42:37 +1000 |
commit | 97f4d3083b036ce3e68d6346a6140a22123d5864 (patch) | |
tree | 301c95453934721eca9855cd01b1d0da089e3246 /sshd.c | |
parent | 99f95ba82673d33215dce17bfa1512b57f54ec09 (diff) |
upstream commit
remove compat20/compat13/compat15 variables
ok markus@
Upstream-ID: 43802c035ceb3fef6c50c400e4ecabf12354691c
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -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); |