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

set of groups.

Volker
(This used to be commit e77fe4a77a6b0b8d92014edb073b36d01a1a5169)

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index e46dfe7fd4cbb6801c3e3cb7f9c4dee2c1fdac0e..a3c4e7a13550732aea4f874a5cb573ede8ac3c3b 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/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++) {