[SCM] Samba Shared Repository - branch master updated - 798b9e1ad6bbdcf873285d0e1c5008e566744162

[Steven Danneman]

The branch, master has been updated
       via  798b9e1ad6bbdcf873285d0e1c5008e566744162 (commit)
      from  a36415a5651c598e1dd28e163995e266dad51130 (commit)

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


- Log -----------------------------------------------------------------
commit 798b9e1ad6bbdcf873285d0e1c5008e566744162
Author: Steven Danneman <steven.danneman at isilon.com>
Date:   Sun Nov 23 18:20:19 2008 -0800

    Fix to allow setting of NULL DACL/SACL
    
    This is a modification of Jeremy's 7522ef15aca2429ef57c75d8297dd8121e79c9da
    commit.
    
    If no DACL/SACL is present in the packet, the SEC_INFO field should still be
    passed down as is to the VFS layer to signal the creation of a NULL DACL/SACL.
    
    As seen in metze RAW-ACL test_nttrans_create_null_dacl(), a NULL DACL is set
    regardless of the SEC_DESC_DACL_PRESENT bit being set.

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

Summary of changes:
 source3/smbd/nttrans.c |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 52c16e2..8a18c87 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -721,21 +721,12 @@ static NTSTATUS set_sd(files_struct *fsp, uint8 *data, uint32 sd_len,
 		return status;
 	}
 
-	if (psd->owner_sid==0) {
+	if (psd->owner_sid == NULL) {
 		security_info_sent &= ~OWNER_SECURITY_INFORMATION;
 	}
-	if (psd->group_sid==0) {
+	if (psd->group_sid == NULL) {
 		security_info_sent &= ~GROUP_SECURITY_INFORMATION;
 	}
-	if (psd->sacl==0) {
-		security_info_sent &= ~SACL_SECURITY_INFORMATION;
-	}
-	if (security_info_sent & DACL_SECURITY_INFORMATION) {
-		psd->type |= SEC_DESC_DACL_PRESENT;
-	}
-	if (psd->dacl==0) {
-		security_info_sent &= ~DACL_SECURITY_INFORMATION;
-	}
 
 	/* Convert all the generic bits. */
 	security_acl_map_generic(psd->dacl, &file_generic_mapping);


-- 
Samba Shared Repository