- renamed parameters to avoid name conflicts with bash

diff --git a/data/default-config b/data/default-config
index 30157d89e26eb7a6d87a4c49e5cfd95c13ec9417..9ff05f7d9206feeaf12caa14209eb0fef3c1cd25 100644 (file)
--- a/data/default-config
+++ b/data/default-config
@@ -6,8 +6,8 @@ SUBVOLUME="/"
 FSTYPE="btrfs"
 
 # users and groups allowed to work with config
-USERS=""
-GROUPS=""
+ALLOW_USERS=""
+ALLOW_GROUPS=""
 
 # start comparing pre- and post-snapshot in background after creating
 # post-snapshot

diff --git a/server/MetaSnapper.cc b/server/MetaSnapper.cc
index 6913125e5745f18af30a75077f4a1f73675c962a..6c7bfe22341d8c597d84d156ae87394c3ba2267d 100644 (file)
--- a/server/MetaSnapper.cc
+++ b/server/MetaSnapper.cc
@@ -156,7 +156,7 @@ get_group_uids(const char* groupname, vector<uid_t>& uids)
 MetaSnapper::MetaSnapper(const ConfigInfo& config_info)
     : config_info(config_info), snapper(NULL)
 {
-    map<string, string>::const_iterator pos1 = config_info.raw.find("USERS");
+    map<string, string>::const_iterator pos1 = config_info.raw.find("ALLOW_USERS");
     if (pos1 != config_info.raw.end())
     {
        string tmp = pos1->second;
@@ -174,7 +174,7 @@ MetaSnapper::MetaSnapper(const ConfigInfo& config_info)
        }
     }
 
-    map<string, string>::const_iterator pos2 = config_info.raw.find("GROUPS");
+    map<string, string>::const_iterator pos2 = config_info.raw.find("ALLOW_GROUPS");
     if (pos2 != config_info.raw.end())
     {
        string tmp = pos2->second;