From: Volker Lendecke <vl@samba.org>
Date: Mon, 18 Dec 2023 20:40:46 +0000 (+0100)
Subject: lib: Simplify grant_privilege_bitmap()
X-Git-Tag: talloc-2.4.2~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=995d1958e9a83c3a19181a343d5c66894b1efee7;p=thirdparty%2Fsamba.git

lib: Simplify grant_privilege_bitmap()

ZERO_STRUCT on a uint64_t doesn't really make sense...

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c
index 5e66222072b..05a4c9a1e76 100644
--- a/source3/lib/privileges.c
+++ b/source3/lib/privileges.c
@@ -339,16 +339,12 @@ NTSTATUS privilege_enum_sids(enum sec_privilege privilege, TALLOC_CTX *mem_ctx,
 
 static bool grant_privilege_bitmap(const struct dom_sid *sid, const uint64_t priv_mask)
 {
-	uint64_t old_mask, new_mask;
+	uint64_t old_mask = 0, new_mask = 0;
 	struct dom_sid_buf buf;
 
-	ZERO_STRUCT( old_mask );
-	ZERO_STRUCT( new_mask );
-
-	if ( get_privileges( sid, &old_mask ) )
+	if ( get_privileges( sid, &old_mask ) ) {
 		new_mask = old_mask;
-	else
-		new_mask = 0;
+	}
 
 	new_mask |= priv_mask;