- renamed setting

diff --git a/data/default-config b/data/default-config
index 2c5f0c526bdaa3c8b43fcf5750510620bfc61f5d..76ddd47e4985c3f631af86ad3f752d7fbc76e157 100644 (file)
--- a/data/default-config
+++ b/data/default-config
@@ -12,7 +12,7 @@ ALLOW_GROUPS=""
 
 # sync users and groups from ALLOW_USERS and ALLOW_GROUPS to .snapshots
 # directory
-SYNC_ACLS="no"
+SYNC_ACL="no"
 
 
 # start comparing pre- and post-snapshot in background after creating

diff --git a/doc/snapper-configs.xml.in b/doc/snapper-configs.xml.in
index 896aa77336a7feeddd6f1c8d06d8a296b0168071..8ebf490e5843ecc9659ac0b43efa6b5bc893cab8 100644 (file)
--- a/doc/snapper-configs.xml.in
+++ b/doc/snapper-configs.xml.in
@@ -77,10 +77,10 @@
       </varlistentry>
 
       <varlistentry>
-       <term><option>SYNC_ACLS=<replaceable>boolean</replaceable></option></term>
+       <term><option>SYNC_ACL=<replaceable>boolean</replaceable></option></term>
        <listitem>
          <para>Defines whether snapper will sync the users and groups from
-         ALLOW_USERS and ALLOW_GROUPS to the <filename>.snapshots</filename>
+         ALLOW_USERS and ALLOW_GROUPS to the ACL of the <filename>.snapshots</filename>
          directory.</para>
          <para>Also see the PERMISSONS section in
          <citerefentry><refentrytitle>snapper</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>

diff --git a/doc/snapper.xml.in b/doc/snapper.xml.in
index 54fc1e399014493b49716a798ef7902161c4d51e..65a08c690626f485601c3a1d9125c5cc8252f90d 100644 (file)
--- a/doc/snapper.xml.in
+++ b/doc/snapper.xml.in
@@ -505,7 +505,7 @@
        <para><command>setfacl -m u:tux:rx .snapshots</command></para>
       </listitem>
     </itemizedlist>
-    <para>The last method can be performed by snapper, see the SYNC_ACLS setting in
+    <para>The last method can be performed by snapper, see the SYNC_ACL setting in
     <citerefentry><refentrytitle>snapper-configs</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
   </refsect1>
 
@@ -575,7 +575,8 @@
       <citerefentry><refentrytitle>pam_snapper</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>lvm</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>attr</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>attr</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>acl</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     </para>
   </refsect1>
 

diff --git a/snapper/Snapper.cc b/snapper/Snapper.cc
index 08fa70b99c53d500cb60f11c8425b7f0722d9a4d..090f2001370d28528eb7abd4148217128171f7bb 100644 (file)
--- a/snapper/Snapper.cc
+++ b/snapper/Snapper.cc
@@ -456,17 +456,17 @@ namespace snapper
        config_info->save();
 
        if (raw.find(KEY_ALLOW_USERS) != raw.end() || raw.find(KEY_ALLOW_GROUPS) != raw.end() ||
-           raw.find(KEY_SYNC_ACLS) != raw.end())
+           raw.find(KEY_SYNC_ACL) != raw.end())
        {
            bool sync_acl;
-           if (config_info->getValue(KEY_SYNC_ACLS, sync_acl) && sync_acl == true)
-               syncAcls();
+           if (config_info->getValue(KEY_SYNC_ACL, sync_acl) && sync_acl == true)
+               syncAcl();
        }
     }
 
 
     void
-    Snapper::syncAcls() const
+    Snapper::syncAcl() const
     {
        vector<uid_t> uids;
        vector<string> users;
@@ -494,7 +494,7 @@ namespace snapper
            }
        }
 
-       syncAcls(uids, gids);
+       syncAcl(uids, gids);
     }
 
 
@@ -529,7 +529,7 @@ namespace snapper
 
 
     void
-    Snapper::syncAcls(const vector<uid_t>& uids, const vector<gid_t>& gids) const
+    Snapper::syncAcl(const vector<uid_t>& uids, const vector<gid_t>& gids) const
     {
        SDir infos_dir = openInfosDir();
 

diff --git a/snapper/Snapper.h b/snapper/Snapper.h
index 730ac8b66bb92c51c3b71f56d34e6548a7d47d08..99ab93e1f5573bb92f95dddabcf1dd63b6b6ca48 100644 (file)
--- a/snapper/Snapper.h
+++ b/snapper/Snapper.h
@@ -158,7 +158,7 @@ namespace snapper
 
        void setConfigInfo(const map<string, string>& raw);
 
-       void syncAcls() const;
+       void syncAcl() const;
 
     private:
 
@@ -167,7 +167,7 @@ namespace snapper
 
        void loadIgnorePatterns();
 
-       void syncAcls(const vector<uid_t>& uids, const vector<gid_t>& gids) const;
+       void syncAcl(const vector<uid_t>& uids, const vector<gid_t>& gids) const;
 
        ConfigInfo* config_info;
 

diff --git a/snapper/SnapperDefines.h b/snapper/SnapperDefines.h
index c26ad10f857f876960228bc2e817cbd3ef5d81c8..8490894c9ba6332cb132722f5a677e69e8158ccc 100644 (file)
--- a/snapper/SnapperDefines.h
+++ b/snapper/SnapperDefines.h
@@ -41,7 +41,7 @@
 
 #define KEY_ALLOW_USERS "ALLOW_USERS"
 #define KEY_ALLOW_GROUPS "ALLOW_GROUPS"
-#define KEY_SYNC_ACLS "SYNC_ACLS"
+#define KEY_SYNC_ACL "SYNC_ACL"
 
 
 #endif