summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-10-21 11:19:39 -0700
committerJeremy Allison <jra@samba.org>2011-10-21 21:51:18 +0200
commit6bd49ea4aee40f86fccd349a5aecdade87474609 (patch)
treefd6bfb5f5317d1d4c24afa76f395a66845d4be96
parentaa1fd273171682271552ce82ce637c32c5047503 (diff)
downloadsamba-6bd49ea4aee40f86fccd349a5aecdade87474609.tar.gz
samba-6bd49ea4aee40f86fccd349a5aecdade87474609.tar.bz2
samba-6bd49ea4aee40f86fccd349a5aecdade87474609.zip
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
-rw-r--r--docs-xml/smbdotconf/protocol/aclcheckpermissions.xml3
-rw-r--r--source3/param/loadparm.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
index 79b6da7afa..27ed6c5295 100644
--- 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 aa27d2cba3..3ea6f66c0b 100644
--- 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",