diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-26T12·58+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-26T12·58+0100 |
commit | 42eb4afd7a38f3024a66da037d9f39859f7bd8f3 (patch) | |
tree | e507b47e8eef9d7d68d57ec7c376678f83b68f9b /src/nix-daemon | |
parent | bf4a577a586d99b7bc4298ae662e312eb73815e2 (diff) |
Simplify getting use-ssh-substituter from untrusted users
Diffstat (limited to 'src/nix-daemon')
-rw-r--r-- | src/nix-daemon/nix-daemon.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc index 58ef2109b313..f40cdd51b4b6 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(); |