The branch, v3-6-test has been updated
via ee9a43c... s3:winbindd: fix error handling in
wb_next_grent_fetch_done()
from 7326fdb... s3-libsmbclient Convert dos error codes to NTstatus in
async libsmbclient.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit ee9a43c57ed106c2de060ff217224424a583ee83
Author: Stefan Metzmacher <[email protected]>
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
(cherry picked from commit c9621a8c005cfc547a26dd92b8183b43665eec5c)
-----------------------------------------------------------------------
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 d053700..ab3ad0a 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 = rpccli_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
