More completely fix recursive nix, unbreak tests

See:
88b5d0c8e8 (commitcomment-27406365)
This commit is contained in:
Will Dietz 2018-02-07 15:17:44 -06:00
parent 88b5d0c8e8
commit f201b7733e

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)" : ""))