vfs_zfsacl: add manpage entry for zfsacl:denymissingspecial

[samba.git] / docs-xml / manpages / vfs_zfsacl.8.xml

diff --git a/docs-xml/manpages/vfs_zfsacl.8.xml b/docs-xml/manpages/vfs_zfsacl.8.xml
index 650d3149b894d460a93d423e28fd6c84eb78ec83..3eb0760dcba5cfd6c27fc3e555aa7fa553913c1d 100644 (file)
--- a/docs-xml/manpages/vfs_zfsacl.8.xml
+++ b/docs-xml/manpages/vfs_zfsacl.8.xml
@@ -100,8 +100,8 @@
                <para>Following is the behaviour of Samba for different values :</para>
                <itemizedlist>
                <listitem><para><command>dontcare (default)</command> - copy the ACEs as they come</para></listitem>
-               <listitem><para><command>reject</command> - stop operation and exit with error on ACL set op</para></listitem>
-               <listitem><para><command>ignore</command> - don't include the second matching ACE</para></listitem>
+               <listitem><para><command>reject (deprecated)</command> - stop operation and exit with error on ACL set op</para></listitem>
+               <listitem><para><command>ignore (deprecated)</command> - don't include the second matching ACE</para></listitem>
                <listitem><para><command>merge</command> - bitwise OR the 2 ace.flag fields and 2 ace.mask fields of the 2 duplicate ACEs into 1 ACE</para></listitem>
                </itemizedlist>
                </listitem>
@@ -125,6 +125,21 @@
                </listitem>
                </varlistentry>
 
+               <varlistentry>
+               <term>zfsacl:denymissingspecial = [yes|no]</term>
+               <listitem>
+               <para>Prevent users from setting an ACL that lacks NFSv4 special entries
+               (owner@, group@, everyone@). ZFS will automatically generate these these entries
+               when calculating the inherited ACL of new files if the ACL of the parent directory
+               lacks an inheriting special entry. This may result in user confusion and unexpected
+               change in permissions of files and directories as the inherited ACL is generated.</para>
+               <itemizedlist>
+               <listitem><para><command>yes</command></para></listitem>
+               <listitem><para><command>no (default)</command></para></listitem>
+               </itemizedlist>
+               </listitem>
+               </varlistentry>
+
        </variablelist>
 </refsect1>
 
@@ -137,14 +152,14 @@
         <smbconfsection name="[samba_zfs_share]"/>
        <smbconfoption name="vfs objects">zfsacl</smbconfoption>
        <smbconfoption name="path">/test/zfs_mount</smbconfoption>
-       <smbconfoption name="nfs4: mode">special</smbconfoption>
+       <smbconfoption name="nfs4: mode">simple</smbconfoption>
        <smbconfoption name="nfs4: acedup">merge</smbconfoption>
 </programlisting>
 </refsect1>
 
 <refsect1>
        <title>VERSION</title>
-       <para>This man page is correct for version &doc.version; of the Samba suite.
+       <para>This man page is part of version &doc.version; of the Samba suite.
        </para>
 </refsect1>