1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00

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
This commit is contained in:
Volker Lendecke
2011-06-18 09:55:05 +02:00
committed by Volker Lendecke
parent bb66504dad
commit 36e674c134

View File

@ -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;
}