winbind: use state->{ev,request} in wb_domain_request_send()

This will reduce the diff for the following changes.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13295

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index d0a40a8bac43b8cea90f4371112a8eeae3d36709..cd67aece66495c4e32cddd68ed7562796c90676d 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -354,11 +354,15 @@ struct tevent_req *wb_domain_request_send(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
+       state->domain = domain;
+       state->ev = ev;
+       state->request = request;
+
        state->child = choose_domain_child(domain);
 
        if (domain->initialized) {
-               subreq = wb_child_request_send(state, ev, state->child,
-                                              request);
+               subreq = wb_child_request_send(state, state->ev, state->child,
+                                              state->request);
                if (tevent_req_nomem(subreq, req)) {
                        return tevent_req_post(req, ev);
                }
@@ -366,10 +370,6 @@ struct tevent_req *wb_domain_request_send(TALLOC_CTX *mem_ctx,
                return req;
        }
 
-       state->domain = domain;
-       state->ev = ev;
-       state->request = request;
-
        state->init_req = talloc_zero(state, struct winbindd_request);
        if (tevent_req_nomem(state->init_req, req)) {
                return tevent_req_post(req, ev);
@@ -382,7 +382,7 @@ struct tevent_req *wb_domain_request_send(TALLOC_CTX *mem_ctx,
                state->init_req->data.init_conn.is_primary = domain->primary;
                fstrcpy(state->init_req->data.init_conn.dcname, "");
 
-               subreq = wb_child_request_send(state, ev, state->child,
+               subreq = wb_child_request_send(state, state->ev, state->child,
                                               state->init_req);
                if (tevent_req_nomem(subreq, req)) {
                        return tevent_req_post(req, ev);
@@ -403,7 +403,8 @@ struct tevent_req *wb_domain_request_send(TALLOC_CTX *mem_ctx,
        state->init_req->cmd = WINBINDD_GETDCNAME;
        fstrcpy(state->init_req->domain_name, domain->name);
 
-       subreq = wb_child_request_send(state, ev, state->child, request);
+       subreq = wb_child_request_send(state, state->ev, state->child,
+                                      state->request);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }