mirror of
https://github.com/HeidiSQL/HeidiSQL.git
synced 2025-08-06 18:24:26 +08:00
Last tweaks for SSH tunnel, issue #401:
* Only pass SSH port if not empty * Put right default file extension for selecting a PuTTY private key file (*.ppk) * Add text hints on more input fields * Indicate modified session also if SSH host, port or key file was changed.
This commit is contained in:
@ -382,6 +382,7 @@ object connform: Tconnform
|
||||
Anchors = [akLeft, akTop, akRight]
|
||||
TabOrder = 3
|
||||
Text = 'editSSHUser'
|
||||
TextHint = 'Your secure shell username'
|
||||
OnChange = Modification
|
||||
end
|
||||
object editSSHPassword: TEdit
|
||||
@ -393,6 +394,7 @@ object connform: Tconnform
|
||||
PasswordChar = '*'
|
||||
TabOrder = 4
|
||||
Text = 'editSSHPassword'
|
||||
TextHint = 'Your secure shell password'
|
||||
OnChange = Modification
|
||||
end
|
||||
object editSSHPlinkExe: TButtonedEdit
|
||||
@ -406,6 +408,7 @@ object connform: Tconnform
|
||||
RightButton.Visible = True
|
||||
TabOrder = 0
|
||||
Text = 'editSSHPlinkExe'
|
||||
TextHint = 'Doubleclick to select plink.exe ...'
|
||||
OnChange = editSSHPlinkExeChange
|
||||
OnDblClick = PickFile
|
||||
OnRightButtonClick = PickFile
|
||||
@ -442,6 +445,7 @@ object connform: Tconnform
|
||||
RightButton.Visible = True
|
||||
TabOrder = 5
|
||||
Text = 'editSSHPrivateKey'
|
||||
TextHint = 'PuTTY private key (*.ppk)'
|
||||
OnChange = Modification
|
||||
OnDblClick = PickFile
|
||||
OnRightButtonClick = PickFile
|
||||
|
@ -573,10 +573,13 @@ begin
|
||||
or ((opCompress in FOrgParams.Options) <> chkCompressed.Checked)
|
||||
or (FOrgParams.NetType <> TNetType(comboNetType.ItemIndex))
|
||||
or (FOrgParams.StartupScriptFilename <> editStartupScript.Text)
|
||||
or (FOrgParams.SSHHost <> editSSHHost.Text)
|
||||
or (IntToStr(FOrgParams.SSHPort) <> editSSHPort.Text)
|
||||
or (FOrgParams.SSHPlinkExe <> editSSHPlinkExe.Text)
|
||||
or (IntToStr(FOrgParams.SSHLocalPort) <> editSSHlocalport.Text)
|
||||
or (FOrgParams.SSHUser <> editSSHUser.Text)
|
||||
or (FOrgParams.SSHPassword <> editSSHPassword.Text)
|
||||
or (FOrgParams.SSHPrivateKey <> editSSHPrivateKey.Text)
|
||||
or (FOrgParams.SSLPrivateKey <> editSSLPrivateKey.Text)
|
||||
or (FOrgParams.SSLCertificate <> editSSLCertificate.Text)
|
||||
or (FOrgParams.SSLCACertificate <> editSSLCACertificate.Text);
|
||||
@ -686,6 +689,8 @@ begin
|
||||
Selector.Filter := 'SQL-files (*.sql)|*.sql|All files (*.*)|*.*'
|
||||
else if Edit = editSSHPlinkExe then
|
||||
Selector.Filter := 'Executables (*.exe)|*.exe|All files (*.*)|*.*'
|
||||
else if Edit = editSSHPrivateKey then
|
||||
Selector.Filter := 'PuTTY private key (*.ppk)|*.ppk|All files (*.*)|*.*'
|
||||
else
|
||||
Selector.Filter := 'Privacy Enhanced Mail certificates (*.pem)|*.pem|Certificates (*.crt)|*.crt|All files (*.*)|*.*';
|
||||
// Find relevant label and set open dialog's title
|
||||
|
@ -350,6 +350,7 @@ begin
|
||||
PlinkCmd := PlinkCmd + FParameters.Hostname;
|
||||
if FParameters.SSHPassword <> '' then
|
||||
PlinkCmd := PlinkCmd + ' -pw ' + FParameters.SSHPassword;
|
||||
if FParameters.SSHPort > 0 then
|
||||
PlinkCmd := PlinkCmd + ' -P ' + IntToStr(FParameters.SSHPort);
|
||||
if FParameters.SSHPrivateKey <> '' then
|
||||
PlinkCmd := PlinkCmd + ' -i "' + FParameters.SSHPrivateKey + '"';
|
||||
|
Reference in New Issue
Block a user