diff options
author | Colin Watson <cjwatson@debian.org> | 2008-11-23 13:19:32 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2008-11-23 13:19:32 +0000 |
commit | f063add71b66011cca8c313fe0c681b0f0e1b97f (patch) | |
tree | f1d2d4b4bd694e682a313163fd1374a24e1fedea /ssh.c | |
parent | e7e618e9f81c5b722a34996fdf7ec372ec093d85 (diff) |
* 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).
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1205,7 +1205,8 @@ ssh_session2(void) | |||
1205 | id = ssh_session2_open(); | 1205 | id = ssh_session2_open(); |
1206 | 1206 | ||
1207 | /* If we don't expect to open a new session, then disallow it */ | 1207 | /* If we don't expect to open a new session, then disallow it */ |
1208 | if (options.control_master == SSHCTL_MASTER_NO) { | 1208 | if (options.control_master == SSHCTL_MASTER_NO && |
1209 | (datafellows & SSH_NEW_OPENSSH)) { | ||
1209 | debug("Requesting no-more-sessions@openssh.com"); | 1210 | debug("Requesting no-more-sessions@openssh.com"); |
1210 | packet_start(SSH2_MSG_GLOBAL_REQUEST); | 1211 | packet_start(SSH2_MSG_GLOBAL_REQUEST); |
1211 | packet_put_cstring("no-more-sessions@openssh.com"); | 1212 | packet_put_cstring("no-more-sessions@openssh.com"); |