aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Lohrmann <dmoagx@users.noreply.github.com>2015-01-13 23:10:48 +0100
committerMax Lohrmann <dmoagx@users.noreply.github.com>2015-01-13 23:10:48 +0100
commit36c6eeb3a2fd966a810b241eeaaf00ec45f419b4 (patch)
tree66d309b7488fb04999be678e35bf71282f73b116
parente9b8c389a1e2341ff069de8de4305163dfef48b5 (diff)
parent4e3fc71b8f5c4a1cc53e2ebf6dee1ad9ccfbaf34 (diff)
downloadsequelpro-36c6eeb3a2fd966a810b241eeaaf00ec45f419b4.tar.gz
sequelpro-36c6eeb3a2fd966a810b241eeaaf00ec45f419b4.tar.bz2
sequelpro-36c6eeb3a2fd966a810b241eeaaf00ec45f419b4.zip
Merge pull request #2053 from chn42/master
Fix an issue with ssh -L forwarding (OpenSSL 6.7 onwards only supports ":" as separator to "-L")
-rw-r--r--Source/SPSSHTunnel.m6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m
index 1c217986..3b58d331 100644
--- a/Source/SPSSHTunnel.m
+++ b/Source/SPSSHTunnel.m
@@ -373,10 +373,10 @@
[taskArguments addObject:sshHost];
}
if (useHostFallback) {
- [taskArguments addObject:[NSString stringWithFormat:@"-L %ld/127.0.0.1/%ld", (long)localPort, (long)remotePort]];
- [taskArguments addObject:[NSString stringWithFormat:@"-L %ld/%@/%ld", (long)localPortFallback, remoteHost, (long)remotePort]];
+ [taskArguments addObject:[NSString stringWithFormat:@"-L %ld:127.0.0.1:%ld", (long)localPort, (long)remotePort]];
+ [taskArguments addObject:[NSString stringWithFormat:@"-L %ld:%@:%ld", (long)localPortFallback, remoteHost, (long)remotePort]];
} else {
- [taskArguments addObject:[NSString stringWithFormat:@"-L %ld/%@/%ld", (long)localPort, remoteHost, (long)remotePort]];
+ [taskArguments addObject:[NSString stringWithFormat:@"-L %ld:%@:%ld", (long)localPort, remoteHost, (long)remotePort]];
}
[task setArguments:taskArguments];