diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc index 776ffdb834314c2d397b61d0e36dcd11aec7da7c..7ff7a9bffc49a5f1f3d28644e548c9ad94d0cd95 100644 --- a/src/libstore/ssh.cc +++ b/src/libstore/ssh.cc @@ -2,6 +2,17 @@ namespace nix { +SSHMaster::SSHMaster(const std::string & host, const std::string & keyFile, bool useMaster, bool compress, int logFD) + : host(host) + , keyFile(keyFile) + , useMaster(useMaster) + , compress(compress) + , logFD(logFD) +{ + if (host == "" || hasPrefix(host, "-")) + throw Error("invalid SSH host name '%s'", host); +} + void SSHMaster::addCommonSSHOpts(Strings & args) { for (auto & i : tokenizeString<Strings>(getEnv("NIX_SSHOPTS"))) diff --git a/src/libstore/ssh.hh b/src/libstore/ssh.hh index 18dea227ad1ffcfe4afc2672a7eb6568b3158129..1268e6d000547e03a95a380a6482c271363eeaaa 100644 --- a/src/libstore/ssh.hh +++ b/src/libstore/ssh.hh @@ -28,14 +28,7 @@ private: public: - SSHMaster(const std::string & host, const std::string & keyFile, bool useMaster, bool compress, int logFD = -1) - : host(host) - , keyFile(keyFile) - , useMaster(useMaster) - , compress(compress) - , logFD(logFD) - { - } + SSHMaster(const std::string & host, const std::string & keyFile, bool useMaster, bool compress, int logFD = -1); struct Connection {