diff options
| author | AmineChikhaoui <amine.chikhaoui91@gmail.com> | 2018-02-07T20·09+0100 |
|---|---|---|
| committer | AmineChikhaoui <amine.chikhaoui91@gmail.com> | 2018-02-07T20·09+0100 |
| commit | a56637205a0f4cfa271e16cec15e2a08f79f496d (patch) | |
| tree | ba2f0b910f71abd7872aafa4f5c7be64fdf7f17b /src | |
| parent | 47ad88099b1cd2b19bdf3eef35c21baf35cc7e82 (diff) | |
| parent | 88b5d0c8e89afefbc547b6243c5aa5a3ec8176e9 (diff) | |
Merge branch 'master' of https://github.com/NixOS/nix into parallel-xz
Diffstat (limited to 'src')
| -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 b5d49b6428ac..0e5ff370cf74 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)) + if ((!trusted && !matchUser(user, group, allowedUsers)) || group == "nixbld") 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)" : "")) |