From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Fri, 18 Aug 2023 02:37:35 +0000 (+1200)
Subject: libcli/security: remove unused tmp_ctx in calculate_inherited_from_parent()
X-Git-Tag: tevent-0.16.0~815
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55cc6b52c02cff0b1aeb86044de931bda0d535ab;p=thirdparty%2Fsamba.git

libcli/security: remove unused tmp_ctx in calculate_inherited_from_parent()

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/libcli/security/create_descriptor.c b/libcli/security/create_descriptor.c
index bad5f179634..aeb3ea3d3bb 100644
--- a/libcli/security/create_descriptor.c
+++ b/libcli/security/create_descriptor.c
@@ -145,19 +145,13 @@ static struct security_acl *calculate_inherited_from_parent(TALLOC_CTX *mem_ctx,
 							    struct GUID *object_list)
 {
 	uint32_t i;
-	TALLOC_CTX *tmp_ctx = NULL;
 	struct security_acl *tmp_acl = NULL;
 
 	if (!acl) {
 		return NULL;
 	}
-	tmp_ctx = talloc_new(mem_ctx);
-	if (!tmp_ctx) {
-		return NULL;
-	}
 	tmp_acl = talloc_zero(mem_ctx, struct security_acl);
 	if (!tmp_acl) {
-		TALLOC_FREE(tmp_ctx);
 		return NULL;
 	}
 
@@ -273,7 +267,6 @@ static struct security_acl *calculate_inherited_from_parent(TALLOC_CTX *mem_ctx,
 						       struct security_ace,
 						       tmp_acl->num_aces+1);
 			if (tmp_acl->aces == NULL) {
-				talloc_free(tmp_ctx);
 				TALLOC_FREE(tmp_acl);
 				return NULL;
 			}
@@ -347,7 +340,6 @@ static struct security_acl *calculate_inherited_from_parent(TALLOC_CTX *mem_ctx,
 					       struct security_ace,
 					       tmp_acl->num_aces+1);
 		if (tmp_acl->aces == NULL) {
-			TALLOC_FREE(tmp_ctx);
 			TALLOC_FREE(tmp_acl);
 			return NULL;
 		}
@@ -371,14 +363,12 @@ static struct security_acl *calculate_inherited_from_parent(TALLOC_CTX *mem_ctx,
 		}
 	}
 	if (tmp_acl->num_aces == 0) {
-		TALLOC_FREE(tmp_ctx);
 		TALLOC_FREE(tmp_acl);
 		return NULL;
 	}
 	if (acl) {
 		tmp_acl->revision = acl->revision;
 	}
-	TALLOC_FREE(tmp_ctx);
 	return tmp_acl;
 }