[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  c9621a8... s3:winbindd: fix error handling in wb_next_grent_fetch_done()
      from  5c272b8... Remove place-holders when it is single domain

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c9621a8c005cfc547a26dd92b8183b43665eec5c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Aug 17 08:05:14 2010 +0200

    s3:winbindd: fix error handling in wb_next_grent_fetch_done()
    
    We should not use 'result' uninitialized.
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/wb_next_grent.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/wb_next_grent.c b/source3/winbindd/wb_next_grent.c
index 523f8cd..1c906bd 100644
--- a/source3/winbindd/wb_next_grent.c
+++ b/source3/winbindd/wb_next_grent.c
@@ -100,7 +100,15 @@ static void wb_next_grent_fetch_done(struct tevent_req *subreq)
 
 	status = dcerpc_wbint_QueryGroupList_recv(subreq, state, &result);
 	TALLOC_FREE(subreq);
-	if (!NT_STATUS_IS_OK(status) || !NT_STATUS_IS_OK(result)) {
+	if (!NT_STATUS_IS_OK(status)) {
+		/* Ignore errors here, just log it */
+		DEBUG(10, ("query_user_list for domain %s returned %s\n",
+			   state->gstate->domain->name,
+			   nt_errstr(status)));
+		tevent_req_nterror(req, status);
+		return;
+	}
+	if (!NT_STATUS_IS_OK(result)) {
 		/* Ignore errors here, just log it */
 		DEBUG(10, ("query_user_list for domain %s returned %s/%s\n",
 			   state->gstate->domain->name,


-- 
Samba Shared Repository