Fix tests fail, misc changes

NixOS · Mar 20, 2020 · c1f1e6f · c1f1e6f
1 parent 7a6d76d
commit c1f1e6f
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc
@@ -3,18 +3,16 @@
 namespace nix {
 
 SSHMaster::SSHMaster(const std::string & hostNport, const std::string & keyFile, bool useMaster, bool compress, int logFD)
-    : fakeSSH(host == "localhost")
-    , keyFile(keyFile)
+    : keyFile(keyFile)
     , useMaster(useMaster && !fakeSSH)
     , compress(compress)
     , logFD(logFD)
 {
-    auto res = split(hostNport, *":");
-    port = res.size() > 0 ? atoi(res[1].c_str()) : 0;
+    auto res = split(hostNport, ':');
+    port = res.size() > 1 ? atoi(res[1].c_str()) : 0; // if we have a port, parse that
     host = res[0];
 
-    // help: is this above already using the actual value or is it broken without this
-    fakeSSH = host == "localhost";
+    fakeSSH = host == "localhost" && !port;
 
     if (host == "" || hasPrefix(host, "-"))
         throw Error("invalid SSH host name '%s'", host);