diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-09-21 12:19:39 +0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-09-21 12:19:39 +0000 |
commit | 8d06842a761bab72a2886420c6c47f9daedf30e3 (patch) | |
tree | 075106ebd1bcfbda99dc46dd1a6684149ec503c7 /src/libstore | |
parent | 89cd0f57b174ec4dc7e0a4e6015ed401272d9aad (diff) |
* Configuration options for trusted local builds.
Diffstat (limited to 'src/libstore')
-rw-r--r-- | src/libstore/globals.cc | 7 | ||||
-rw-r--r-- | src/libstore/globals.hh | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 4387c8acc..8cbae54e2 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -11,16 +11,13 @@ string nixDBPath = "/UNINIT"; string nixConfDir = "/UNINIT"; bool keepFailed = false; - bool keepGoing = false; - bool tryFallback = false; - Verbosity buildVerbosity = lvlInfo; - unsigned int maxBuildJobs = 1; - bool readOnlyMode = false; +bool buildAllowRoot = true; +list<string> buildUsers; static bool settingsRead = false; diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index e2ae2ed65..327b1bbc3 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -2,6 +2,7 @@ #define __GLOBALS_H #include <string> +#include <set> #include "util.hh" using namespace std; @@ -52,6 +53,15 @@ extern unsigned int maxBuildJobs; database. */ extern bool readOnlyMode; +/* Whether to allow builds by root. Corresponds to the + `build-allow-root' configuration option. */ +extern bool buildAllowRoot; + +/* The list of users under which root-initiated builds can be + performed. Correspons to the `build-users' configuration + option. */ +extern list<string> buildUsers; + string querySetting(const string & name, const string & def); |