From 37b1e93f4be2348ce343bca4a609732d04b62a7b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 10 Feb 2023 14:35:04 +0100 Subject: [PATCH] daemon.cc: Rename UserSettings -> AuthorizationSettings This is a bit more accurate. It's a private name, but before you know it, someone might make it public! --- src/nix/daemon.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/nix/daemon.cc b/src/nix/daemon.cc index 2ba56ee26..a22bccba1 100644 --- a/src/nix/daemon.cc +++ b/src/nix/daemon.cc @@ -34,7 +34,7 @@ using namespace nix; using namespace nix::daemon; -struct UserSettings : Config { +struct AuthorizationSettings : Config { Setting 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;