Deprecate "acl check permissions".

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Oct 21 21:51:18 CEST 2011 on sn-devel-104

diff --git a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
index 79b6da7afa5edaaaf5ec0520a4d039867cec550c..27ed6c5295bd0073a704486b84364e88d87ed1ae 100644 (file)
--- a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
+++ b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
@@ -4,6 +4,9 @@
                  advanced="1" wizard="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
+    <para>Please note this parameter is now deprecated in Samba 3.6.2 and will be removed
+    in a future version of Samba.
+    </para>
     <para>This boolean parameter controls what <citerefentry><refentrytitle>smbd</refentrytitle> 
     <manvolnum>8</manvolnum></citerefentry>does on receiving a protocol request of "open for delete"
     from a Windows client. If a Windows client doesn't have permissions to delete a file then they

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index aa27d2cba373ef86f56a4b92f96e1437034c2f4e..3ea6f66c0b446e0a5074d97158a18cda55da0875 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1148,7 +1148,7 @@ static struct parm_struct parm_table[] = {
                .offset         = LOCAL_VAR(bAclCheckPermissions),
                .special        = NULL,
                .enum_list      = NULL,
-               .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
+               .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE | FLAG_DEPRECATED,
        },
        {
                .label          = "acl group control",