3 files changed, 9 insertions, 9 deletions
diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/ldap.h
index 09cf5e4c6f..5538c9dc06 100644
--- a/source4/libcli/ldap/ldap.h
+++ b/source4/libcli/ldap/ldap.h
@@ -249,7 +249,7 @@ struct ldap_message {
 	bool                   *controls_decoded;
 };
 
-struct event_context;
+struct tevent_context;
 struct cli_credentials;
 struct dom_sid;
 struct asn1_data;
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 082f6fa3e4..18784135cc 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -43,7 +43,7 @@
 */
 _PUBLIC_ struct ldap_connection *ldap4_new_connection(TALLOC_CTX *mem_ctx, 
 					     struct loadparm_context *lp_ctx,
-					     struct event_context *ev)
+					     struct tevent_context *ev)
 {
 	struct ldap_connection *conn;
 
@@ -224,7 +224,7 @@ void ldap_read_io_handler(void *private_data, uint16_t flags)
 /*
   handle ldap socket events
 */
-static void ldap_io_handler(struct event_context *ev, struct fd_event *fde, 
+static void ldap_io_handler(struct tevent_context *ev, struct tevent_fd *fde, 
 			    uint16_t flags, void *private_data)
 {
 	struct ldap_connection *conn = talloc_get_type(private_data, 
@@ -544,7 +544,7 @@ static int ldap_request_destructor(struct ldap_request *req)
 /*
   called on timeout of a ldap request
 */
-static void ldap_request_timeout(struct event_context *ev, struct timed_event *te, 
+static void ldap_request_timeout(struct tevent_context *ev, struct tevent_timer *te, 
 				      struct timeval t, void *private_data)
 {
 	struct ldap_request *req = talloc_get_type(private_data, struct ldap_request);
@@ -562,7 +562,7 @@ static void ldap_request_timeout(struct event_context *ev, struct timed_event *t
 /*
   called on completion of a one-way ldap request
 */
-static void ldap_request_complete(struct event_context *ev, struct timed_event *te, 
+static void ldap_request_complete(struct tevent_context *ev, struct tevent_timer *te, 
 				  struct timeval t, void *private_data)
 {
 	struct ldap_request *req = talloc_get_type(private_data, struct ldap_request);
diff --git a/source4/libcli/ldap/ldap_client.h b/source4/libcli/ldap/ldap_client.h
index 13b0bf725c..084de2e6dc 100644
--- a/source4/libcli/ldap/ldap_client.h
+++ b/source4/libcli/ldap/ldap_client.h
@@ -44,7 +44,7 @@ struct ldap_request {
 		void *private_data;
 	} async;
 
-	struct timed_event *time_event;
+	struct tevent_timer *time_event;
 };
 
 
@@ -88,8 +88,8 @@ struct ldap_connection {
 	char *last_error;
 
 	struct {
-		struct event_context *event_ctx;
-		struct fd_event *fde;
+		struct tevent_context *event_ctx;
+		struct tevent_fd *fde;
 	} event;
 
 	struct packet_context *packet;
@@ -97,7 +97,7 @@ struct ldap_connection {
 
 struct ldap_connection *ldap4_new_connection(TALLOC_CTX *mem_ctx, 
 					     struct loadparm_context *lp_ctx,
-					     struct event_context *ev);
+					     struct tevent_context *ev);
 
 NTSTATUS ldap_connect(struct ldap_connection *conn, const char *url);
 struct composite_context *ldap_connect_send(struct ldap_connection *conn,