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

This commit is contained in:
AmineChikhaoui 2018-02-08 12:24:48 +01:00
commit 0685a6480a
No known key found for this signature in database
GPG key ID: C0C8C84C15BCCD1C

View file

@ -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)) || group == "nixbld") if ((!trusted && !matchUser(user, group, allowedUsers)) || group == settings.buildUsersGroup)
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)" : ""))