From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Mon, 30 Oct 2023 01:35:12 +0000 (+1300)
Subject: libcli/security: Make use of sids_contains_sid_attrs()
X-Git-Tag: talloc-2.4.2~930
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce3f04dca9a673517879998af60fd7b346201de3;p=thirdparty%2Fsamba.git

libcli/security: Make use of sids_contains_sid_attrs()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/libcli/security/util_sid.c b/libcli/security/util_sid.c
index 33886e788f7..b3408b37a46 100644
--- a/libcli/security/util_sid.c
+++ b/libcli/security/util_sid.c
@@ -444,16 +444,10 @@ NTSTATUS add_sid_to_array_attrs_unique(TALLOC_CTX *mem_ctx,
 				       const struct dom_sid *sid, uint32_t attrs,
 				       struct auth_SidAttr **sids, uint32_t *num_sids)
 {
-	uint32_t i;
-
-	for (i=0; i<(*num_sids); i++) {
-		if (attrs != (*sids)[i].attrs) {
-			continue;
-		}
-		if (!dom_sid_equal(sid, &(*sids)[i].sid)) {
-			continue;
-		}
+	bool contains;
 
+	contains = sids_contains_sid_attrs(*sids, *num_sids, sid, attrs);
+	if (contains) {
 		return NT_STATUS_OK;
 	}