libcli/cldap: pass tevent_context to cldap_set_incoming_handler()

metze
(cherry picked from commit 3ed85d7c69f9b68a709572ab221b9da1c17a146e)

diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c
index aa34a6d6cf4a25f4b576b14401867394e597a7e1..7a571c9ce8fa44c2ab70b10087cacd2de885e3ef 100644 (file)
--- a/libcli/cldap/cldap.c
+++ b/libcli/cldap/cldap.c
@@ -86,6 +86,7 @@ struct cldap_socket {
 
        /* what to do with incoming request packets */
        struct {
+               struct tevent_context *ev;
                void (*handler)(struct cldap_socket *,
                                void *private_data,
                                struct cldap_incoming *);
@@ -405,6 +406,7 @@ nterror:
   setup a handler for incoming requests
 */
 NTSTATUS cldap_set_incoming_handler(struct cldap_socket *c,
+                                   struct tevent_context *ev,
                                    void (*handler)(struct cldap_socket *,
                                                    void *private_data,
                                                    struct cldap_incoming *),
@@ -418,7 +420,7 @@ NTSTATUS cldap_set_incoming_handler(struct cldap_socket *c,
        if (c->event.allow_poll) {
                return NT_STATUS_INVALID_PIPE_STATE;
        }
-
+       c->incoming.ev = ev;
        c->incoming.handler = handler;
        c->incoming.private_data = private_data;
 

diff --git a/libcli/cldap/cldap.h b/libcli/cldap/cldap.h
index d1197481fb5fb74e7f493b31e876622d762a2d6c..0098da521a7b8e30306d7a0604bee6aad4162dc1 100644 (file)
--- a/libcli/cldap/cldap.h
+++ b/libcli/cldap/cldap.h
@@ -58,6 +58,7 @@ NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx,
                           struct cldap_socket **_cldap);
 
 NTSTATUS cldap_set_incoming_handler(struct cldap_socket *cldap,
+                                   struct tevent_context *ev,
                                    void (*handler)(struct cldap_socket *,
                                                    void *private_data,
                                                    struct cldap_incoming *),

diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index 5dbf9c99be85d00257d2f92f9c612f2cc0bf6f66..d21958b72ce50294d0c50390a9e258e921561490 100644 (file)
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -136,7 +136,8 @@ static NTSTATUS cldapd_add_socket(struct cldapd_server *cldapd, struct loadparm_
        }
        talloc_free(socket_address);
 
-       cldap_set_incoming_handler(cldapsock, cldapd_request_handler, cldapd);
+       cldap_set_incoming_handler(cldapsock, cldapd->task->event_ctx,
+                                  cldapd_request_handler, cldapd);
 
        return NT_STATUS_OK;
 }