diff options
| author |   djm <djm@openbsd.org> | 2018-01-23 05:27:21 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2018-01-23 05:27:21 +0000 |
| commit | 672fe979a97fd7692fe5dc383491eee200cc82a4 (patch) | |
| tree | a5eee618fbb044084bc9499817fa167955edbd0c /usr.bin/ssh/serverloop.c | |
| parent | try harder to preserve errno during ssh_connect_direct() to make the (diff) | |
| download | wireguard-openbsd-672fe979a97fd7692fe5dc383491eee200cc82a4.tar.xz wireguard-openbsd-672fe979a97fd7692fe5dc383491eee200cc82a4.zip | |
Drop compatibility hacks for some ancient SSH implementations, including
ssh.com <=2.* and OpenSSH <= 3.*.
These versions were all released in or before 2001 and predate the
final SSH RFCs. The hacks in question aren't necessary for RFC-
compliant SSH implementations.
ok markus@
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 887ffaee312..dd213cd4237 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.202 2017/12/18 23:16:24 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.203 2018/01/23 05:27:21 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -644,10 +644,8 @@ server_input_channel_open(int type, u_int32_t seq, struct ssh *ssh) packet_start(SSH2_MSG_CHANNEL_OPEN_FAILURE); packet_put_int(rchan); packet_put_int(reason); - if (!(datafellows & SSH_BUG_OPENFAILURE)) { - packet_put_cstring(errmsg ? errmsg : "open failed"); - packet_put_cstring(""); - } + packet_put_cstring(errmsg ? errmsg : "open failed"); + packet_put_cstring(""); packet_send(); } free(ctype); |