Skip to content

Commit

Permalink
Backport PR #4720: never use ssh multiplexer in tunnels
Browse files Browse the repository at this point in the history
`ssh -f` is [broken in OpenSSH](https://bugzilla.mindrot.org/show_bug.cgi?id=1948) when a ControlMaster multiplexed connection is used.

`-S none` disables the multiplexed connection.

closes #4717
  • Loading branch information
minrk committed Jan 28, 2014
1 parent d84134e commit fed448e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion IPython/external/ssh/tunnel.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def openssh_tunnel(lport, rport, server, remoteip='127.0.0.1', keyfile=None, pas
server, port = server.split(':')
ssh += " -p %s" % port

cmd = "%s -f -L 127.0.0.1:%i:%s:%i %s sleep %i" % (
cmd = "%s -f -S none -L 127.0.0.1:%i:%s:%i %s sleep %i" % (
ssh, lport, remoteip, rport, server, timeout)
tunnel = pexpect.spawn(cmd)
failed = False
Expand Down

0 comments on commit fed448e

Please sign in to comment.