diff options
| -rw-r--r-- | src/download-via-ssh/download-via-ssh.cc | 12 | ||||
| -rw-r--r-- | src/nix-daemon/nix-daemon.cc | 5 |
2 files changed, 3 insertions, 14 deletions
diff --git a/src/download-via-ssh/download-via-ssh.cc b/src/download-via-ssh/download-via-ssh.cc index b5350f998..6361e71e9 100644 --- a/src/download-via-ssh/download-via-ssh.cc +++ b/src/download-via-ssh/download-via-ssh.cc @@ -111,18 +111,6 @@ void run(Strings args) if (args.empty()) throw UsageError("download-via-ssh requires an argument"); - Settings::SettingsMap overrides = settings.getOverrides(); - Settings::SettingsMap::iterator use = overrides.find("untrusted-use-ssh-substituter"); - if (use != overrides.end()) { - if (use->second == "true") settings.useSshSubstituter = true; - else if (use->second == "false") settings.useSshSubstituter = false; - else throw Error(format("configuration option `use-ssh-substituter' should be either `true' or `false', not `%1%'") - % use->second); - } - - if (!settings.useSshSubstituter) - return; - if (settings.sshSubstituterHosts.empty()) return; diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc index 58ef2109b..f40cdd51b 100644 --- a/src/nix-daemon/nix-daemon.cc +++ b/src/nix-daemon/nix-daemon.cc @@ -557,11 +557,12 @@ static void performOp(bool trusted, unsigned int clientVersion, for (unsigned int i = 0; i < n; i++) { string name = readString(from); string value = readString(from); - if (name == "build-timeout") - string2Int(value, settings.buildTimeout); + if (name == "build-timeout" || name == "use-ssh-substituter") + settings.set(name, value); else settings.set(trusted ? name : "untrusted-" + name, value); } + settings.update(); } startWork(); stopWork(); |