Load samba-3.6.6 into branches/samba/upstream.upstream/3.6.6

git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@4134 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 10 insertions, 3 deletions

diff --git a/docs/htmldocs/manpages/vfs_acl_tdb.8.html b/docs/htmldocs/manpages/vfs_acl_tdb.8.html
index 3c068816ca..ba468876ff 100644
--- a/docs/htmldocs/manpages/vfs_acl_tdb.8.html
+++ b/docs/htmldocs/manpages/vfs_acl_tdb.8.html
@@ -6,9 +6,16 @@
 	</p><p>
 	The ACL settings are stored in
 	<code class="filename">$LOCKDIR/file_ntacls.tdb</code>.
-	</p><p>This module is stackable.</p></div><div class="refsect1" title="OPTIONS"><a name="id266837"></a><h2>OPTIONS</h2><p>
-	There are no options for <code class="literal">vfs_acl_tdb</code>.
-	</p></div><div class="refsect1" title="AUTHOR"><a name="id266853"></a><h2>AUTHOR</h2><p>The original Samba software and related utilities
+	</p><p>This module is stackable.</p></div><div class="refsect1" title="OPTIONS"><a name="id266837"></a><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span class="term">acl_tdb:ignore system acls = [yes|no]</span></dt><dd><p>
+		When set to <span class="emphasis"><em>yes</em></span>, a best effort mapping
+		from/to the POSIX ACL layer will <span class="emphasis"><em>not</em></span> be
+		done by this module. The default is <span class="emphasis"><em>no</em></span>,
+		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.
+		</p></dd></dl></div></div><div class="refsect1" title="AUTHOR"><a name="id266876"></a><h2>AUTHOR</h2><p>The original Samba software and related utilities
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar
 	to the way the Linux kernel is developed.</p></div></div></body></html>