summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/serverloop.c
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2018-01-23 05:27:22 +0000
committerDamien Miller <djm@cvs.openbsd.org>2018-01-23 05:27:22 +0000
commit350394e9345181dbe9b52e7518cf02cd0cc0634d (patch)
treec44bb296efacd5731f90540850c0b7af595e55b4 /usr.bin/ssh/serverloop.c
parentaa23a9b92e6f114f66ba0cb01e7c1097297cdd50 (diff)
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.c8
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);