s3/doc: document the ignore system acls option of vfs_acl_xattr and vfs_acl_tdb

Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Sat Dec 10 15:30:46 CET 2011 on sn-devel-104
(cherry picked from commit f452add2231906742c9fd119371cd4fd81a1bdd6)

Fix bug #8652 (vfs_acl man pages miss "ignore system acls" option).
(cherry picked from commit ceeab5c66cef2c5aa7931329a9976c8173f44467)

diff --git a/docs-xml/manpages-3/vfs_acl_tdb.8.xml b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
index 6f3d84b8d27ac4e02791229052d4a1ddf4879203..a6a05a5bc08914bb05c0114ff3673d59d014f63c 100644 (file)
--- a/docs-xml/manpages-3/vfs_acl_tdb.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
@@ -45,9 +45,26 @@
 
 <refsect1>
        <title>OPTIONS</title>
-       <para>
-       There are no options for <command>vfs_acl_tdb</command>.
-       </para>
+
+       <variablelist>
+               <!-- please keep in sync with the other acl vfs modules that provide the same options -->
+               <varlistentry>
+               <term>acl_tdb:ignore system acls = [yes|no]</term>
+               <listitem>
+               <para>
+               When set to <emphasis>yes</emphasis>, a best effort mapping
+               from/to the POSIX ACL layer will <emphasis>not</emphasis> be
+               done by this module. The default is <emphasis>no</emphasis>,
+               which means that Samba keeps setting and evaluating both the
+               system ACLs and the NT ACLs. This is better if you need your
+               system ACLs be set for local or NFS file access, too. If you only
+               access the data via Samba you might set this to yes to achieve
+               better NT ACL compatibility.
+               </para>
+               </listitem>
+               </varlistentry>
+       </variablelist>
+
 </refsect1>
 
 <refsect1>

diff --git a/docs-xml/manpages-3/vfs_acl_xattr.8.xml b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
index 7e751ad7760deefe36b6a0cf2f8350023ef7cd82..b4a63630ce7d186d153f1f5f0ae4cd51b65b14e8 100644 (file)
--- a/docs-xml/manpages-3/vfs_acl_xattr.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
@@ -49,9 +49,26 @@
 
 <refsect1>
        <title>OPTIONS</title>
-       <para>
-       There are no options for <command>vfs_acl_xattr</command>.
-       </para>
+
+       <variablelist>
+               <!-- please keep in sync with the other acl vfs modules that provide the same options -->
+               <varlistentry>
+               <term>acl_xattr:ignore system acls = [yes|no]</term>
+               <listitem>
+               <para>
+               When set to <emphasis>yes</emphasis>, a best effort mapping
+               from/to the POSIX ACL layer will <emphasis>not</emphasis> be
+               done by this module. The default is <emphasis>no</emphasis>,
+               which means that Samba keeps setting and evaluating both the
+               system ACLs and the NT ACLs. This is better if you need your
+               system ACLs be set for local or NFS file access, too. If you only
+               access the data via Samba you might set this to yes to achieve
+               better NT ACL compatibility.
+               </para>
+               </listitem>
+               </varlistentry>
+       </variablelist>
+
 </refsect1>
 
 <refsect1>