diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-07 15:17:44 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-07 15:19:28 -0600 |
| commit | f201b7733e22cc236a41093a88cc789239d994bd (patch) | |
| tree | d4b395c81b300bf31d8a9ed59e6563b78ed50230 | |
| parent | 88b5d0c8e89afefbc547b6243c5aa5a3ec8176e9 (diff) | |
More completely fix recursive nix, unbreak tests
See:
https://github.com/NixOS/nix/commit/88b5d0c8e89afefbc547b6243c5aa5a3ec8176e9#commitcomment-27406365
| -rw-r--r-- | src/nix-daemon/nix-daemon.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc index 0e5ff370c..d3a8ebbdd 100644 --- a/src/nix-daemon/nix-daemon.cc +++ b/src/nix-daemon/nix-daemon.cc @@ -994,7 +994,7 @@ static void daemonLoop(char * * argv) if (matchUser(user, group, trustedUsers)) 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); printInfo(format((string) "accepted connection from pid %1%, user %2%" + (trusted ? " (trusted)" : "")) |