[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  322654d We now pass "samba3.raw.acls.generic" and "samba3.smb2.acls.GENERIC" with the max access change.
       via  aef862c Fix bug #9189 - SMB2 Create doesn't return correct MAX ACCESS access mask in blob.
      from  f240a4c s4:rpc_server/drsuapi: use talloc_zero instead of talloc() in dcesrv_drsuapi_DsBind()

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


- Log -----------------------------------------------------------------
commit 322654d7923315ac43b2cf9e7a942d535f2ee224
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Sep 20 13:35:47 2012 -0700

    We now pass "samba3.raw.acls.generic" and "samba3.smb2.acls.GENERIC" with the max access change.
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Sep 25 04:57:44 CEST 2012 on sn-devel-104

commit aef862c7b0f9c4c00f08f57f04d3ccdd859b5b18
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Sep 20 12:32:10 2012 -0700

    Fix bug #9189 - SMB2 Create doesn't return correct MAX ACCESS access mask in blob.
    
    If we aren't already granted DELETE access, check if we have
    DELETE_CHILD in the containing directory.

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

Summary of changes:
 selftest/knownfail  |    3 ---
 source3/smbd/open.c |    7 +++++++
 2 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/knownfail b/selftest/knownfail
index f6835f6..9feaac2 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -45,7 +45,6 @@
 ^samba3.blackbox.smbclient_machine_auth.plain \(s3dc:local\)# the S3dc does not currently set up a self-join
 ^samba3.raw.samba3hide.samba3hide\((s3dc|plugin_s4_dc)\) # This test fails against an smbd environment with NT ACLs enabled
 ^samba3.raw.samba3closeerr.samba3closeerr\(s3dc\) # This test fails against an smbd environment with NT ACLs enabled
-^samba3.raw.acls.generic\(s3dc\) # This fails against smbd
 ^samba3.base.delete.deltest16a
 ^samba3.base.delete.deltest17a
 ^samba3.unix.whoami anonymous connection.whoami\(plugin_s4_dc\) # We need to resolve if we should be including SID_NT_WORLD and SID_NT_NETWORK in this token
@@ -197,7 +196,6 @@
 ^samba3.smb2.lease.multibreak
 ^samba3.smb2.oplock.batch12
 ^samba3.smb2.oplock.batch20
-^samba3.smb2.acls.GENERIC
 ^samba3.smb2.streams.rename
 ^samba3.smb2.streams.rename2
 ^samba3.smb2.streams.attributes
@@ -214,7 +212,6 @@
 # but in the interests of ensuring we do not regress, we run the tests
 # and list the current failures here.
 #
-^samba3.raw.acls.generic\(plugin_s4_dc\)
 ^samba3.rpc.eventlog.eventlog.GetLogIntormation\(plugin_s4_dc\)
 ^samba3.rpc.eventlog.eventlog.FlushEventLog\(plugin_s4_dc\)
 ^samba3.rpc.eventlog.eventlog.ReportEventLog\(plugin_s4_dc\)
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index a06a9f2..7312707 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1714,6 +1714,13 @@ static NTSTATUS smbd_calculate_maximum_allowed_access(
 		return NT_STATUS_ACCESS_DENIED;
 	}
 	*p_access_mask = (access_granted | FILE_READ_ATTRIBUTES);
+
+	if (!(access_granted & DELETE_ACCESS)) {
+		if (can_delete_file_in_directory(conn, smb_fname)) {
+			*p_access_mask |= DELETE_ACCESS;
+		}
+	}
+
 	return NT_STATUS_OK;
 }
 


-- 
Samba Shared Repository