[PATCH 06/13] s3/profiles: replace dup_sec_desc() usage
David Disseldorp
ddiss at samba.org
Mon May 26 09:29:56 MDT 2014
Use security_descriptor_copy() instead, which is also provided by
libcli.
Signed-off-by: David Disseldorp <ddiss at samba.org>
---
source3/utils/profiles.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index 442a7de..a193582 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -129,8 +129,14 @@ static bool copy_registry_tree( REGF_FILE *infile, REGF_NK_REC *nk,
/* swap out the SIDs in the security descriptor */
- if ( !(new_sd = dup_sec_desc( outfile->mem_ctx, nk->sec_desc->sec_desc )) ) {
- fprintf( stderr, "Failed to copy security descriptor!\n" );
+ if (nk->sec_desc->sec_desc == NULL) {
+ new_sd = NULL;
+ } else {
+ new_sd = security_descriptor_copy(outfile->mem_ctx,
+ nk->sec_desc->sec_desc);
+ }
+ if (new_sd == NULL) {
+ fprintf(stderr, "Failed to copy security descriptor!\n");
return False;
}
--
1.8.4.5
More information about the samba-technical
mailing list