Try to avoid infinite loops when reteriving users - even from broken servers.

Andrew Bartlett

diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index 7a0f5671b99aec03026e84901a5f6f8f468acc8a..7756cd87cdbc3883c8ed6cbf1c80d8e469dd3d24 100644 (file)
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -874,7 +874,10 @@ static NTSTATUS cmd_samr_query_dispinfo(struct cli_state *cli,
                                                 &start_idx, info_level,
                                                 &num_entries, max_entries, &ctr);
 
-               if (!NT_STATUS_IS_OK(result))
+               if (!NT_STATUS_IS_OK(result) && !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) 
+                       break;
+
+               if (num_entries == 0) 
                        break;
 
                for (i = 0; i < num_entries; i++) {