aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-09-24 11:58:40 -0500
committerWill Dietz <w@wdtz.org>2018-09-25 03:22:08 -0500
commit8df367a92dc417363f06a10f3e6da87d986d04f2 (patch)
tree385a7487b8226a3bd5b119b9edcd5bb28b266581 /src
parent42e4ea2b6dee6581a1f5e2a82e902eb8f1d83940 (diff)
nix-daemon: allow setting builders to "" by any user (untrusted)
(cherry picked from commit a94a2eb1cb1c81e90a7529be5fecac27899a3442)
Diffstat (limited to 'src')
-rw-r--r--src/nix-daemon/nix-daemon.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index 644fa6681..615c1f5dc 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -557,7 +557,8 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
;
else if (trusted
|| name == settings.buildTimeout.name
- || name == "connect-timeout")
+ || name == "connect-timeout"
+ || (name == "builders" && value == ""))
settings.set(name, value);
else if (setSubstituters(settings.substituters))
;