lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge branch 'master' of https://github.com/NixOS/nix into parallel-xz

Browse source
This commit is contained in:
AmineChikhaoui 2018-02-07 21:09:04 +01:00
parent 47ad88099b 88b5d0c8e8
commit a56637205a
No known key found for this signature in database
GPG key ID: C0C8C84C15BCCD1C
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nix-daemon/nix-daemon.cc
View file

@ -994,7 +994,7 @@ static void daemonLoop(char * * argv)
if (matchUser(user, group, trustedUsers))
trusted = true;
if (!trusted && !matchUser(user, group, allowedUsers))
if ((!trusted && !matchUser(user, group, allowedUsers)) || group == "nixbld")
throw Error(format("user '%1%' is not allowed to connect to the Nix daemon") % user);
printInfo(format((string) "accepted connection from pid %1%, user %2%" + (trusted ? " (trusted)" : ""))