Merge branch 'master' of https://github.com/NixOS/nix into parallel-xz
This commit is contained in:
commit
a56637205a
1 changed files with 1 additions and 1 deletions
|
@ -994,7 +994,7 @@ static void daemonLoop(char * * argv)
|
||||||
if (matchUser(user, group, trustedUsers))
|
if (matchUser(user, group, trustedUsers))
|
||||||
trusted = true;
|
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);
|
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)" : ""))
|
printInfo(format((string) "accepted connection from pid %1%, user %2%" + (trusted ? " (trusted)" : ""))
|
||||||
|
|
Loading…
Reference in a new issue