beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Take port into account when retrieving SSH host keys

Browse source
This commit is contained in:
= 2012-09-05 14:37:31 +02:00
parent 625c953660
commit 63ab6918ec
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SparkleLib/SparkleFetcherBase.cs
View file

@ -261,6 +261,7 @@ namespace SparkleLib {
private string GetHostKey () private string GetHostKey ()
{ {
string host = RemoteUrl.Host; string host = RemoteUrl.Host;
int port = RemoteUrl.Port;
SparkleLogger.LogInfo ("Auth", "Fetching host key for " + host); SparkleLogger.LogInfo ("Auth", "Fetching host key for " + host);
Process process = new Process () { Process process = new Process () {
@ -268,7 +269,7 @@ namespace SparkleLib {
}; };
process.StartInfo.FileName = "ssh-keyscan"; process.StartInfo.FileName = "ssh-keyscan";
process.StartInfo.Arguments = "-t rsa " + host; process.StartInfo.Arguments = "-t rsa -p " + port.ToString() + " " + host;
process.StartInfo.WorkingDirectory = SparkleConfig.DefaultConfig.TmpPath; process.StartInfo.WorkingDirectory = SparkleConfig.DefaultConfig.TmpPath;
process.StartInfo.UseShellExecute = false; process.StartInfo.UseShellExecute = false;
process.StartInfo.RedirectStandardOutput = true; process.StartInfo.RedirectStandardOutput = true;
@ -281,7 +282,7 @@ namespace SparkleLib {
string host_key = process.StandardOutput.ReadToEnd ().Trim (); string host_key = process.StandardOutput.ReadToEnd ().Trim ();
process.WaitForExit (); process.WaitForExit ();
if (process.ExitCode == 0) if (process.ExitCode == 0 && host_key != null)
return host_key; return host_key;
else else
return null; return null;