* Backport from upstream CVS (Markus Friedl):

  - Only send eow and no-more-sessions requests to openssh 5 and newer;
    fixes interop problems with broken ssh v2 implementations (closes:
    #495917).

1 files changed, 2 insertions, 1 deletions

diff --git a/ssh.c b/ssh.c
index e2e2ef498..2b55e6397 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1205,7 +1205,8 @@ ssh_session2(void)
                 id = ssh_session2_open();
 
         /* If we don't expect to open a new session, then disallow it */
-        if (options.control_master == SSHCTL_MASTER_NO) {
+        if (options.control_master == SSHCTL_MASTER_NO &&
+            (datafellows & SSH_NEW_OPENSSH)) {
                 debug("Requesting no-more-sessions@openssh.com");
                 packet_start(SSH2_MSG_GLOBAL_REQUEST);
                 packet_put_cstring("no-more-sessions@openssh.com");