From: David Disseldorp <ddiss@samba.org>
Date: Mon, 26 May 2014 13:41:41 +0000 (+0200)
Subject: s3/profiles: replace dup_sec_desc() usage
X-Git-Tag: tdb-1.3.1~1185
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=aef195d0b3a4111206e9b13b27c135367976974a

s3/profiles: replace dup_sec_desc() usage

Use security_descriptor_copy() instead, which is also provided by
libcli.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index 442a7de0188..a193582387c 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;
 	}