From: Volker Lendecke <vlendec@samba.org> 
Date: Sat, 28 Feb 2004 08:18:09 +0000 (+0000)
Subject: Fix my fix to net rpc group list. We can certainly have more than a single
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~6467
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=e77fe4a77a6b0b8d92014edb073b36d01a1a5169;p=samba.git

Fix my fix to net rpc group list. We can certainly have more than a single
set of groups.

Volker
---

diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index e46dfe7fd4c..a3c4e7a1355 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -1193,7 +1193,8 @@ rpc_group_list_internals(const DOM_SID *domain_sid, const char *domain_name,
 						 &start_idx, 3, &num_entries,
 						 max_entries, max_size, &ctr);
 
-		if (!NT_STATUS_IS_OK(result))
+		if (!NT_STATUS_IS_OK(result) &&
+		    !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES))
 			break;
 						 
 		for (i = 0; i < num_entries; i++) {
@@ -1219,7 +1220,8 @@ rpc_group_list_internals(const DOM_SID *domain_sid, const char *domain_name,
 						  &start_idx, max_entries,
 						  &groups, &num_entries);
 
-		if (!NT_STATUS_IS_OK(result))
+		if (!NT_STATUS_IS_OK(result) &&
+		    !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES))
 			break;
 						 
 		for (i = 0; i < num_entries; i++) {
@@ -1273,7 +1275,8 @@ rpc_group_list_internals(const DOM_SID *domain_sid, const char *domain_name,
 						  &start_idx, max_entries,
 						  &groups, &num_entries);
 						 
-		if (!NT_STATUS_IS_OK(result))
+		if (!NT_STATUS_IS_OK(result) &&
+		    !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES))
 			break;
 						 
 		for (i = 0; i < num_entries; i++) {