From: Arvin Schnell <aschnell@suse.de>
Date: Wed, 5 Sep 2012 08:53:53 +0000 (+0200)
Subject: - renamed parameters to avoid name conflicts with bash
X-Git-Tag: v0.1.3~113
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=725bd9be75f70593e5fbc768f1399fc5ebccefda;p=thirdparty%2Fsnapper.git

- renamed parameters to avoid name conflicts with bash
---

diff --git a/data/default-config b/data/default-config
index 30157d89..9ff05f7d 100644
--- 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 6913125e..6c7bfe22 100644
--- 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;