diff options
author | stuconnolly <stuart02@gmail.com> | 2009-08-28 18:27:36 +0000 |
---|---|---|
committer | stuconnolly <stuart02@gmail.com> | 2009-08-28 18:27:36 +0000 |
commit | aea8e96f2adc91b64e7c521f34890e93f27da36c (patch) | |
tree | cfdaf58dfe18e46c890023cbe53f17231097beb5 /Source/SPSSHTunnel.m | |
parent | 480e035307bfc2dfa5feee16dacd43150b520d6a (diff) | |
download | sequelpro-aea8e96f2adc91b64e7c521f34890e93f27da36c.tar.gz sequelpro-aea8e96f2adc91b64e7c521f34890e93f27da36c.tar.bz2 sequelpro-aea8e96f2adc91b64e7c521f34890e93f27da36c.zip |
If the SSH tunnel is unable to bind to the local port because there is already an existing tunnel, give the user the option of using a standard connection to localhost on the port that is in use in order to use the existing tunnel. Fixes issue #371.
Diffstat (limited to 'Source/SPSSHTunnel.m')
-rw-r--r-- | Source/SPSSHTunnel.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m index 3623a2f2..6c5be81c 100644 --- a/Source/SPSSHTunnel.m +++ b/Source/SPSSHTunnel.m @@ -387,7 +387,7 @@ connectionState = PROXY_STATE_IDLE; [task terminate]; if (lastError) [lastError release]; - lastError = [[NSString alloc] initWithString:NSLocalizedString(@"The SSH Tunnel was unable to bind to the local port. This error may occur if you already have an SSH connection to the same server and are using a 'LocalForward' option in your SSH configuration.", @"SSH tunnel unable to bind to local port message")]; + lastError = [[NSString alloc] initWithString:NSLocalizedString(@"The SSH Tunnel was unable to bind to the local port. This error may occur if you already have an SSH connection to the same server and are using a 'LocalForward' setting in your SSH configuration.\n\nWould you like to fall back to a standard connection to localhost in order to use the existing tunnel?", @"SSH tunnel unable to bind to local port message")]; if (delegate) [delegate performSelectorOnMainThread:stateChangeSelector withObject:self waitUntilDone:NO]; } |