[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  ceeab5c s3/doc: document the ignore system acls option of vfs_acl_xattr and vfs_acl_tdb
      from  6cb6053 s3: Fix bug 8371

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit ceeab5c66cef2c5aa7931329a9976c8173f44467
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Dec 10 13:53:42 2011 +0100

    s3/doc: document the ignore system acls option of vfs_acl_xattr and vfs_acl_tdb
    
    Autobuild-User: Björn Jacke <bj at 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).
    
    Fix bug #8652 (vfs_acl man pages miss "ignore system acls" option).

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages-3/vfs_acl_tdb.8.xml   |   23 ++++++++++++++++++++---
 docs-xml/manpages-3/vfs_acl_xattr.8.xml |   23 ++++++++++++++++++++---
 2 files changed, 40 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/vfs_acl_tdb.8.xml b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
index 646c5ba..7c22dec 100644
--- 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 d428cc2..41a8a97 100644
--- 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>


-- 
Samba Shared Repository