The branch, v3-5-test has been updated
via a8037a5 s3/doc: document the ignore system acls option of
vfs_acl_xattr and vfs_acl_tdb
from 407c3fa manpage: add more undocumented options to mount.cifs manpage
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit a8037a582795ce5bbd9361bf6d000b6110c6eb9b
Author: Björn Jacke <[email protected]>
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 <[email protected]>
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)
-----------------------------------------------------------------------
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 6f3d84b..a6a05a5 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 7e751ad..b4a6363 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
