diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2017-04-13T14·15+0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2017-04-13T14·15+0200 |
commit | 1860070548db119fc5f958febff3a087f21d5c83 (patch) | |
tree | fc0607c8c3536ea5c35d58bfc4489374a1439ad7 /src/nix-daemon/nix-daemon.cc | |
parent | 2040240e238a41c2eb799bf4dbf394fec297ac16 (diff) | |
parent | e7cb2847ab1cec48eac6a86c56885b3f0df76275 (diff) |
Merge branch 'rework-options' of https://github.com/copumpkin/nix
Diffstat (limited to 'src/nix-daemon/nix-daemon.cc')
-rw-r--r-- | src/nix-daemon/nix-daemon.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc index 8786e2561b9c..f4285693f7fb 100644 --- a/src/nix-daemon/nix-daemon.cc +++ b/src/nix-daemon/nix-daemon.cc @@ -878,8 +878,8 @@ static void daemonLoop(char * * argv) struct group * gr = peer.gidKnown ? getgrgid(peer.gid) : 0; string group = gr ? gr->gr_name : std::to_string(peer.gid); - Strings trustedUsers = settings.get("trusted-users", Strings({"root"})); - Strings allowedUsers = settings.get("allowed-users", Strings({"*"})); + Strings trustedUsers = settings.trustedUsers; + Strings allowedUsers = settings.allowedUsers; if (matchUser(user, group, trustedUsers)) trusted = true; |