From 1f4a4536fd5416bebeeae21eaff132d54e8ccef9 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 30 Dec 2010 11:12:42 +0100 Subject: [PATCH] s3:winbind: fix bug #7894 - sporadic winbind panic in rpc query_user_list correctly evaluate return code of rpccli_samr_QueryDisplayInfo() before accessing results. --- source3/winbindd/winbindd_rpc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c index 599c888..b65b126 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++; -- 1.6.3.3