From: Michael Adam <obnox@samba.org>
Date: Thu, 30 Dec 2010 10:12:42 +0000 (+0100)
Subject: s3:winbind: fix bug #7894 - sporadic winbind panic in rpc query_user_list
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=bdebae14aa646dd9f969db5b3d1aa25c971c9381;p=samba.git

s3:winbind: fix bug #7894 - sporadic winbind panic in rpc query_user_list

correctly evaluate return code of rpccli_samr_QueryDisplayInfo()
before accessing results.
---

diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 599c888aad8..b65b126cf03 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -84,6 +84,13 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 						      &total_size,
 						      &returned_size,
 						      &disp_info);
+
+		if (!NT_STATUS_IS_OK(result)) {
+		        if (!NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) {
+		                return result;
+		        }
+		}
+
 		num_dom_users = disp_info.info1.count;
 		start_idx += disp_info.info1.count;
 		loop_count++;