diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-09-25 14:09:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 14:09:00 +0200 |
| commit | 7ccdcc7fed154b6621397417354df4e2fd913215 (patch) | |
| tree | 385a7487b8226a3bd5b119b9edcd5bb28b266581 /src | |
| parent | 42e4ea2b6dee6581a1f5e2a82e902eb8f1d83940 (diff) | |
| parent | 8df367a92dc417363f06a10f3e6da87d986d04f2 (diff) | |
Merge pull request #2448 from dtzWill/feature/nix-daemon-accept-empty-builders-untrusted
nix-daemon: allow setting builders to "" by any user (untrusted)
Diffstat (limited to 'src')
| -rw-r--r-- | src/nix-daemon/nix-daemon.cc | 3 |
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)) ; |