summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2011-12-10 13:53:42 +0100
committerBjoern Jacke <bj@sernet.de>2011-12-10 15:30:46 +0100
commitf452add2231906742c9fd119371cd4fd81a1bdd6 (patch)
tree43e69645e5d2a7017a373106cb702502aa4fe5bf
parent092f1b974433a45c2a24148ca098821ed8e406d8 (diff)
downloadsamba-f452add2231906742c9fd119371cd4fd81a1bdd6.tar.gz
samba-f452add2231906742c9fd119371cd4fd81a1bdd6.tar.bz2
samba-f452add2231906742c9fd119371cd4fd81a1bdd6.zip
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
-rw-r--r--docs-xml/manpages-3/vfs_acl_tdb.8.xml23
-rw-r--r--docs-xml/manpages-3/vfs_acl_xattr.8.xml23
2 files changed, 40 insertions, 6 deletions
diff --git a/docs-xml/manpages-3/vfs_acl_tdb.8.xml b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
index 646c5baf33..7c22dec5de 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 d428cc22a3..41a8a9750a 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>