civodul pushed a commit to tag 1.8
in repository guix.
commit f02c52e3d4065cb8a264fc55eb9fa14d2d0337c8
Author: Eelco Dolstra <[email protected]>
Date: Tue Aug 5 10:19:57 2014 +0200
Doh
---
src/libstore/globals.hh | 9 ---------
src/nix-daemon/nix-daemon.cc | 4 ++--
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index 743d206..55f082e 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -203,15 +203,6 @@ struct Settings {
/* Whether the importNative primop should be enabled */
bool enableImportNative;
- /* List of users that have elevated rights in the Nix daemon, such
- as the ability to specify additional binary caches, or to
- import unsigned NARs. */
- Strings trustedUsers;
-
- /* List of users that are allowed to connect to the daemon, in
- addition to the trusted users. These have normal rights. */
- Strings allowedUsers;
-
private:
SettingsMap settings, overrides;
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index 77c63f1..69d5fd8 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -746,10 +746,10 @@ static void daemonLoop()
Strings trustedUsers = settings.get("trusted-users",
Strings({"root"}));
Strings allowedUsers = settings.get("allowed-users",
Strings({"*"}));
- if (matchUser(user, group, settings.trustedUsers))
+ if (matchUser(user, group, trustedUsers))
trusted = true;
- if (!trusted && !matchUser(user, group, settings.allowedUsers))
+ if (!trusted && !matchUser(user, group, allowedUsers))
throw Error(format("user `%1%' is not allowed to connect to
the Nix daemon") % user);
printMsg(lvlInfo, format((string) "accepted connection from pid
%1%, user %2%"
