[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  6bd49ea Deprecate "acl check permissions".
      from  aa1fd27 s3:idmap_autorid: document allocation pool

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6bd49ea4aee40f86fccd349a5aecdade87474609
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 21 11:19:39 2011 -0700

    Deprecate "acl check permissions".
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri Oct 21 21:51:18 CEST 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 .../smbdotconf/protocol/aclcheckpermissions.xml    |    3 +++
 source3/param/loadparm.c                           |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
index 79b6da7..27ed6c5 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 aa27d2c..3ea6f66 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",


-- 
Samba Shared Repository