lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #7801 from hercules-ci/rename-authorizationsettings

Browse source 
daemon.cc: Rename UserSettings -> AuthorizationSettings
This commit is contained in:
Eelco Dolstra 2023-02-10 16:33:15 +01:00 committed by GitHub
parent 1a0b293eb2 37b1e93f4b
commit 0c77dbab56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nix/daemon.cc
View file

@ -34,7 +34,7 @@
using namespace nix;
using namespace nix::daemon;
struct UserSettings : Config {
struct AuthorizationSettings : Config {
Setting<Strings> trustedUsers{
this, {"root"}, "trusted-users",
@ -67,9 +67,9 @@ struct UserSettings : Config {
)"};
};
UserSettings userSettings;
AuthorizationSettings authorizationSettings;
static GlobalConfig::Register rSettings(&userSettings);
static GlobalConfig::Register rSettings(&authorizationSettings);
#ifndef __linux__
#define SPLICE_F_MOVE 0
@ -240,8 +240,8 @@ static void daemonLoop()
struct group * gr = peer.gidKnown ? getgrgid(peer.gid) : 0;
std::string group = gr ? gr->gr_name : std::to_string(peer.gid);
Strings trustedUsers = userSettings.trustedUsers;
Strings allowedUsers = userSettings.allowedUsers;
Strings trustedUsers = authorizationSettings.trustedUsers;
Strings allowedUsers = authorizationSettings.allowedUsers;
if (matchUser(user, group, trustedUsers))
trusted = Trusted;