diff options
Diffstat (limited to 'source4/libcli/cldap')
-rw-r--r-- | source4/libcli/cldap/cldap.c | 8 | ||||
-rw-r--r-- | source4/libcli/cldap/cldap.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c index 129a80f9ac..556f9bcec3 100644 --- a/source4/libcli/cldap/cldap.c +++ b/source4/libcli/cldap/cldap.c @@ -144,8 +144,8 @@ static void cldap_socket_recv(struct cldap_socket *cldap) /* handle request timeouts */ -static void cldap_request_timeout(struct event_context *event_ctx, - struct timed_event *te, struct timeval t, +static void cldap_request_timeout(struct tevent_context *event_ctx, + struct tevent_timer *te, struct timeval t, void *private) { struct cldap_request *req = talloc_get_type(private, struct cldap_request); @@ -223,7 +223,7 @@ static void cldap_socket_send(struct cldap_socket *cldap) /* handle fd events on a cldap_socket */ -static void cldap_socket_handler(struct event_context *ev, struct fd_event *fde, +static void cldap_socket_handler(struct tevent_context *ev, struct tevent_fd *fde, uint16_t flags, void *private) { struct cldap_socket *cldap = talloc_get_type(private, struct cldap_socket); @@ -240,7 +240,7 @@ static void cldap_socket_handler(struct event_context *ev, struct fd_event *fde, then operations will use that event context */ struct cldap_socket *cldap_socket_init(TALLOC_CTX *mem_ctx, - struct event_context *event_ctx, + struct tevent_context *event_ctx, struct smb_iconv_convenience *iconv_convenience) { struct cldap_socket *cldap; diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h index c78e395faa..17e88716c5 100644 --- a/source4/libcli/cldap/cldap.h +++ b/source4/libcli/cldap/cldap.h @@ -52,7 +52,7 @@ struct cldap_request { /* the ldap message_id */ int message_id; - struct timed_event *te; + struct tevent_timer *te; /* the encoded request */ DATA_BLOB encoded; @@ -72,11 +72,11 @@ struct cldap_request { */ struct cldap_socket { struct socket_context *sock; - struct event_context *event_ctx; + struct tevent_context *event_ctx; struct smb_iconv_convenience *iconv_convenience; /* the fd event */ - struct fd_event *fde; + struct tevent_fd *fde; /* a queue of outgoing requests */ struct cldap_request *send_queue; @@ -112,7 +112,7 @@ struct cldap_search { }; struct cldap_socket *cldap_socket_init(TALLOC_CTX *mem_ctx, - struct event_context *event_ctx, + struct tevent_context *event_ctx, struct smb_iconv_convenience *iconv_convenience); NTSTATUS cldap_set_incoming_handler(struct cldap_socket *cldap, void (*handler)(struct cldap_socket *, struct ldap_message *, |