about summary refs log tree commit diff
path: root/src/nix-daemon/nix-daemon.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-04-14T09·59+0200
committerEelco Dolstra <edolstra@gmail.com>2017-04-14T09·59+0200
commit01dcdfcf336a127438b35b81751a783cde063ab8 (patch)
tree13b05f9f5ebeeaf62bee95b9c7751a67da9b3683 /src/nix-daemon/nix-daemon.cc
parent1673c373c9ddd1fc7ce1e12c79621dafe13fe930 (diff)
nix-daemon: Don't set untrusted-* settings
These are no longer used anywhere.
Diffstat (limited to 'src/nix-daemon/nix-daemon.cc')
-rw-r--r--src/nix-daemon/nix-daemon.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index b4e753f5521f..90bfc67d8775 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -454,10 +454,8 @@ static void performOp(ref<LocalStore> store, bool trusted, unsigned int clientVe
                 string name = readString(from);
                 string value = readString(from);
                 try {
-                    if (name == "build-timeout")
+                    if (trusted || name == "build-timeout")
                         settings.set(name, value);
-                    else
-                        settings.set(trusted ? name : "untrusted-" + name, value);
                 } catch (UsageError & e) {
                     warn(e.what());
                 }