aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2012-06-28 01:07:01 +0000
committerrowanbeentje <rowan@beent.je>2012-06-28 01:07:01 +0000
commit9bbbbc64e09039d6da3e8b274a771032005c8320 (patch)
tree90f81d7b2573f4edf784049fbb878094d6430431
parent018271d3804ead3488e089898695f7f1d2cda812 (diff)
downloadsequelpro-9bbbbc64e09039d6da3e8b274a771032005c8320.tar.gz
sequelpro-9bbbbc64e09039d6da3e8b274a771032005c8320.tar.bz2
sequelpro-9bbbbc64e09039d6da3e8b274a771032005c8320.zip
- Use a custom ControlPath for SSH tunnels in an attempt to address Issue #1095 (issues connecting when a connection master is already present)
-rw-r--r--Source/SPSSHTunnel.m1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m
index 083a1000..51100c97 100644
--- a/Source/SPSSHTunnel.m
+++ b/Source/SPSSHTunnel.m
@@ -298,6 +298,7 @@
[taskArguments addObject:@"-N"]; // Tunnel only
[taskArguments addObject:@"-v"]; // Verbose mode for messages
[taskArguments addObject:@"-o ControlMaster=auto"]; // Support 'master' mode for connection sharing
+ [taskArguments addObject:@"-o ControlPath=/tmp/SequelPro-%r@%h:%p"]; // Set a custom control path to avoid picking up existing masters without forwarding enabled
[taskArguments addObject:@"-o ExitOnForwardFailure=yes"];
[taskArguments addObject:[NSString stringWithFormat:@"-o ConnectTimeout=%ld", (long)connectionTimeout]];
[taskArguments addObject:@"-o NumberOfPasswordPrompts=3"];