upstream commit

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@

OpenBSD-Commit-ID: 4be81c67db57647f907f4e881fb9341448606138

1 files changed, 2 insertions, 2 deletions

diff --git a/ssh.c b/ssh.c
index ac85b2bb5..af4597f88 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.470 2018/01/23 05:06:25 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.471 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
@@ -1931,7 +1931,7 @@ ssh_session2(struct ssh *ssh, struct passwd *pw)
         if (options.control_persist && muxserver_sock == -1)
                 ssh_init_stdio_forwarding(ssh);
 
-        if (!no_shell_flag || (datafellows & SSH_BUG_DUMMYCHAN))
+        if (!no_shell_flag)
                 id = ssh_session2_open(ssh);
         else {
                 packet_set_interactive(