From 6c91dcf8203a6bb977f8c5ede5ff3acf037214e9 Mon Sep 17 00:00:00 2001
From: Keith Winstein <keithw@mit.edu>
Date: Sat, 25 Feb 2012 12:14:58 -0500
Subject: [PATCH] Disable ControlMaster on SSH connection (fixes #24 github
 issue)

---
 scripts/mosh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mosh b/scripts/mosh
index ea2d217..eedb53a 100755
--- a/scripts/mosh
+++ b/scripts/mosh
@@ -130,7 +130,7 @@ if ( $pid == 0 ) { # child
   close $pty_slave;
 
   my $s = q{sh -c 'exec "$@" "`set -- $SSH_CONNECTION; echo $3`"' -- } . $server;
-  exec 'ssh', '-o', "ProxyCommand=$0 --fake-proxy -- %h %p", '-t', $userhost, '--', $s;
+  exec 'ssh', '-S', 'none', '-o', "ProxyCommand=$0 --fake-proxy -- %h %p", '-t', $userhost, '--', $s;
   die "Cannot exec ssh: $!\n";
 } else { # server
   my ( $ip, $port, $key );