Merge pull request #2448 from dtzWill/feature/nix-daemon-accept-empty-builders-untrusted

nix-daemon: allow setting builders to "" by any user (untrusted)
This commit is contained in:
Eelco Dolstra 2018-09-25 14:09:00 +02:00 committed by GitHub
commit 7ccdcc7fed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -557,7 +557,8 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
; ;
else if (trusted else if (trusted
|| name == settings.buildTimeout.name || name == settings.buildTimeout.name
|| name == "connect-timeout") || name == "connect-timeout"
|| (name == "builders" && value == ""))
settings.set(name, value); settings.set(name, value);
else if (setSubstituters(settings.substituters)) else if (setSubstituters(settings.substituters))
; ;