libcli/cldap: pass tevent_context to cldap_netlogon_send()

metze

diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c
index 7436bea4073bead1f1708ebdd5ca4b99f798f109..c73d37466c08fca9f45da3b5848b9814e0876633 100644 (file)
--- a/libcli/cldap/cldap.c
+++ b/libcli/cldap/cldap.c
@@ -841,8 +841,9 @@ static void cldap_netlogon_state_done(struct tevent_req *subreq);
   queue a cldap netlogon for send
 */
 struct tevent_req *cldap_netlogon_send(TALLOC_CTX *mem_ctx,
-                                     struct cldap_socket *cldap,
-                                     const struct cldap_netlogon *io)
+                                      struct tevent_context *ev,
+                                      struct cldap_socket *cldap,
+                                      const struct cldap_netlogon *io)
 {
        struct tevent_req *req, *subreq;
        struct cldap_netlogon_state *state;
@@ -1023,7 +1024,7 @@ NTSTATUS cldap_netlogon(struct cldap_socket *cldap,
                return NT_STATUS_PIPE_BUSY;
        }
 
-       req = cldap_netlogon_send(mem_ctx, cldap, io);
+       req = cldap_netlogon_send(mem_ctx, cldap->event.ctx, cldap, io);
        NT_STATUS_HAVE_NO_MEMORY(req);
 
        if (!tevent_req_poll(req, cldap->event.ctx)) {

diff --git a/libcli/cldap/cldap.h b/libcli/cldap/cldap.h
index 0098da521a7b8e30306d7a0604bee6aad4162dc1..bf259e9aa5a896056518167497170863d134e3fc 100644 (file)
--- a/libcli/cldap/cldap.h
+++ b/libcli/cldap/cldap.h
@@ -114,6 +114,7 @@ struct cldap_netlogon {
 };
 
 struct tevent_req *cldap_netlogon_send(TALLOC_CTX *mem_ctx,
+                                      struct tevent_context *ev,
                                       struct cldap_socket *cldap,
                                       const struct cldap_netlogon *io);
 NTSTATUS cldap_netlogon_recv(struct tevent_req *req,

diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c
index 2adc81d76e154a77cfef13dd24bbc5cc2bb343e5..f00a8d8e16c2b59cce98b9741e91f70b77a3135d 100644 (file)
--- a/source3/nmbd/nmbd_processlogon.c
+++ b/source3/nmbd/nmbd_processlogon.c
@@ -249,7 +249,7 @@ static void nmbd_proxy_logon(struct nmbd_proxy_logon_context *ctx,
        state->io.in.version            = nt_version;
        state->io.in.map_response       = false;
 
-       subreq = cldap_netlogon_send(state,
+       subreq = cldap_netlogon_send(state, nmbd_event_context(),
                                     ctx->cldap_sock,
                                     &state->io);
        if (!subreq) {

diff --git a/source4/libcli/finddcs_cldap.c b/source4/libcli/finddcs_cldap.c
index 293641b37fec52879da4c38eefeb67b56949daba..ee5278f051a5ba252f6d1980a350ebdc6b711ab6 100644 (file)
--- a/source4/libcli/finddcs_cldap.c
+++ b/source4/libcli/finddcs_cldap.c
@@ -234,7 +234,8 @@ static void finddcs_cldap_next_server(struct finddcs_cldap_state *state)
 
        DEBUG(4,("finddcs: performing CLDAP query on %s\n", state->netlogon->in.dest_address));
 
-       subreq = cldap_netlogon_send(state, state->cldap, state->netlogon);
+       subreq = cldap_netlogon_send(state, state->ev,
+                                    state->cldap, state->netlogon);
        if (tevent_req_nomem(subreq, state->req)) {
                return;
        }

diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 34ca97c2747104cbf24d1aece2db3b600c7140f7..6f70f32903ccbe11aff1e25916d9d357b1df7c95 100644 (file)
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -777,7 +777,8 @@ static void becomeDC_send_cldap(struct libnet_BecomeDC_state *s)
                                      NULL, dest_address, &s->cldap.sock);
        if (!composite_is_ok(c)) return;
 
-       req = cldap_netlogon_send(s, s->cldap.sock, &s->cldap.io);
+       req = cldap_netlogon_send(s, s->libnet->event_ctx,
+                                 s->cldap.sock, &s->cldap.io);
        if (composite_nomem(req, c)) return;
        tevent_req_set_callback(req, becomeDC_recv_cldap, s);
 }

diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c
index 85d47a91f926edcbf7f5c78bb22fcb8d25edb58b..be28907b5baad3df5f764f85dd0797eb1bd18a11 100644 (file)
--- a/source4/libnet/libnet_unbecome_dc.c
+++ b/source4/libnet/libnet_unbecome_dc.c
@@ -285,7 +285,8 @@ static void unbecomeDC_send_cldap(struct libnet_UnbecomeDC_state *s)
                                      NULL, dest_address, &s->cldap.sock);
        if (!composite_is_ok(c)) return;
 
-       req = cldap_netlogon_send(s, s->cldap.sock, &s->cldap.io);
+       req = cldap_netlogon_send(s, s->libnet->event_ctx,
+                                 s->cldap.sock, &s->cldap.io);
        if (composite_nomem(req, c)) return;
        tevent_req_set_callback(req, unbecomeDC_recv_cldap, s);
 }

diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c
index 7d02a2580b10ceea454527a954a3cae5dce03a6c..118881d03490fde30d4ed7a9985e8a324d1a5864 100644 (file)
--- a/source4/torture/ldap/cldapbench.c
+++ b/source4/torture/ldap/cldapbench.c
@@ -87,7 +87,8 @@ static bool bench_cldap_netlogon(struct torture_context *tctx, const char *addre
        while (timeval_elapsed(&tv) < timelimit) {
                while (num_sent - (state->pass_count+state->fail_count) < 10) {
                        struct tevent_req *req;
-                       req = cldap_netlogon_send(state, cldap, &search);
+                       req = cldap_netlogon_send(state, tctx->ev,
+                                                 cldap, &search);
 
                        tevent_req_set_callback(req, request_netlogon_handler, state);