[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  36e674c s3: Allow NULL sd_size in make_sec_desc
      from  bb66504 s3:modules fix Bug 8244 - Cannot copy files larger than 2 GB to Samba share

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


- Log -----------------------------------------------------------------
commit 36e674c134cadd6cce44e11ea9f8b5e7819904f5
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jun 18 09:55:05 2011 +0200

    s3: Allow NULL sd_size in make_sec_desc
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sat Jun 18 22:26:15 CEST 2011 on sn-devel-104

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

Summary of changes:
 libcli/security/secdesc.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/security/secdesc.c b/libcli/security/secdesc.c
index 5d75f07..2c8fbc5 100644
--- a/libcli/security/secdesc.c
+++ b/libcli/security/secdesc.c
@@ -173,7 +173,9 @@ struct security_descriptor *make_sec_desc(TALLOC_CTX *ctx,
 	struct security_descriptor *dst;
 	uint32_t offset     = 0;
 
-	*sd_size = 0;
+	if (sd_size != NULL) {
+		*sd_size = 0;
+	}
 
 	if(( dst = talloc_zero(ctx, struct security_descriptor)) == NULL)
 		return NULL;
@@ -203,6 +205,10 @@ struct security_descriptor *make_sec_desc(TALLOC_CTX *ctx,
 	if(dacl && ((dst->dacl = dup_sec_acl(dst, dacl)) == NULL))
 		goto error_exit;
 
+	if (sd_size == NULL) {
+		return dst;
+	}
+
 	offset = SEC_DESC_HEADER_SIZE;
 
 	/*
@@ -229,7 +235,9 @@ struct security_descriptor *make_sec_desc(TALLOC_CTX *ctx,
 
 error_exit:
 
-	*sd_size = 0;
+	if (sd_size != NULL) {
+		*sd_size = 0;
+	}
 	return NULL;
 }
 


-- 
Samba Shared Repository