summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-06-18 09:55:05 +0200
committerVolker Lendecke <vlendec@samba.org>2011-06-18 22:26:15 +0200
commit36e674c134cadd6cce44e11ea9f8b5e7819904f5 (patch)
treef0d3f73060d12ac606e2737aea3feefafb6e1bc8
parentbb66504dadf56366ea30697ae73673de3df08132 (diff)
downloadsamba-36e674c134cadd6cce44e11ea9f8b5e7819904f5.tar.gz
samba-36e674c134cadd6cce44e11ea9f8b5e7819904f5.tar.bz2
samba-36e674c134cadd6cce44e11ea9f8b5e7819904f5.zip
s3: Allow NULL sd_size in make_sec_desc
Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Sat Jun 18 22:26:15 CEST 2011 on sn-devel-104
-rw-r--r--libcli/security/secdesc.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/libcli/security/secdesc.c b/libcli/security/secdesc.c
index 5d75f073f4..2c8fbc59ca 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;
}