From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 22 Jul 2022 13:15:02 +0000 (+0200)
Subject: s3:winbindd: consistently use add_sid_to_array_unique() in winbindd_ads.c
X-Git-Tag: tdb-1.4.13~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79b1934ad41a7f9c0374345bb93136fed59dc65f;p=thirdparty%2Fsamba.git

s3:winbindd: consistently use add_sid_to_array_unique() in winbindd_ads.c

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index dcc73dcf375..d2dcc7b295a 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -637,8 +637,10 @@ static NTSTATUS lookup_usergroups_member(struct winbindd_domain *domain,
 	num_groups = 0;
 
 	/* always add the primary group to the sid array */
-	status = add_sid_to_array(mem_ctx, primary_group, user_sids,
-				  &num_groups);
+	status = add_sid_to_array_unique(mem_ctx,
+					 primary_group,
+					 user_sids,
+					 &num_groups);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto done;
 	}
@@ -658,8 +660,10 @@ static NTSTATUS lookup_usergroups_member(struct winbindd_domain *domain,
 				continue;
 			}
 
-			status = add_sid_to_array(mem_ctx, &group_sid,
-						  user_sids, &num_groups);
+			status = add_sid_to_array_unique(mem_ctx,
+							 &group_sid,
+							 user_sids,
+							 &num_groups);
 			if (!NT_STATUS_IS_OK(status)) {
 				goto done;
 			}
@@ -726,8 +730,10 @@ static NTSTATUS lookup_usergroups_memberof(struct winbindd_domain *domain,
 	num_groups = 0;
 
 	/* always add the primary group to the sid array */
-	status = add_sid_to_array(mem_ctx, primary_group, user_sids,
-				  &num_groups);
+	status = add_sid_to_array_unique(mem_ctx,
+					 primary_group,
+					 user_sids,
+					 &num_groups);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto done;
 	}
@@ -769,8 +775,10 @@ static NTSTATUS lookup_usergroups_memberof(struct winbindd_domain *domain,
 			continue;
 		}
 
-		status = add_sid_to_array(mem_ctx, &group_sids[i], user_sids,
-					  &num_groups);
+		status = add_sid_to_array_unique(mem_ctx,
+						 &group_sids[i],
+						 user_sids,
+						 &num_groups);
 		if (!NT_STATUS_IS_OK(status)) {
 			goto done;
 		}
@@ -915,8 +923,10 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 	*user_sids = NULL;
 	num_groups = 0;
 
-	status = add_sid_to_array(mem_ctx, &primary_group, user_sids,
-				  &num_groups);
+	status = add_sid_to_array_unique(mem_ctx,
+					 &primary_group,
+					 user_sids,
+					 &num_groups);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto done;
 	}