From: Andrew Bartlett <abartlet@samba.org> 
Date: Tue, 25 Jun 2002 11:20:14 +0000 (+0000)
Subject: Try to avoid infinite loops when reteriving users - even from broken servers.
X-Git-Tag: samba-3.0.0alpha18~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebc8452a30b2a9bdd6698af8dad489f3f92ae7a6;p=thirdparty%2Fsamba.git

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 7a0f5671b99..7756cd87cdb 100644
--- 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++) {