about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-02-07T21·17-0600
committerWill Dietz <w@wdtz.org>2018-02-07T21·19-0600
commitf201b7733e22cc236a41093a88cc789239d994bd (patch)
treed4b395c81b300bf31d8a9ed59e6563b78ed50230 /src
parent88b5d0c8e89afefbc547b6243c5aa5a3ec8176e9 (diff)
More completely fix recursive nix, unbreak tests
See:
https://github.com/NixOS/nix/commit/88b5d0c8e89afefbc547b6243c5aa5a3ec8176e9#commitcomment-27406365
Diffstat (limited to 'src')
-rw-r--r--src/nix-daemon/nix-daemon.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index 0e5ff370cf74..d3a8ebbdda50 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)" : ""))