8 files changed, 14 insertions, 14 deletions
diff --git a/source4/libcli/resolve/bcast.c b/source4/libcli/resolve/bcast.c
index 866ce7a152..da58eb8665 100644
--- a/source4/libcli/resolve/bcast.c
+++ b/source4/libcli/resolve/bcast.c
@@ -36,7 +36,7 @@ struct resolve_bcast_data {
   broadcast name resolution method - async send
  */
 struct composite_context *resolve_name_bcast_send(TALLOC_CTX *mem_ctx, 
-						  struct event_context *event_ctx,
+						  struct tevent_context *event_ctx,
 						  void *userdata, uint32_t flags,
 						  uint16_t port,
 						  struct nbt_name *name)
diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c
index 17e7aad290..be93538c7d 100644
--- a/source4/libcli/resolve/dns_ex.c
+++ b/source4/libcli/resolve/dns_ex.c
@@ -48,8 +48,8 @@ struct dns_ex_state {
 	char **names;
 	pid_t child;
 	int child_fd;
-	struct fd_event *fde;
-	struct event_context *event_ctx;
+	struct tevent_fd *fde;
+	struct tevent_context *event_ctx;
 };
 
 /*
@@ -328,7 +328,7 @@ done:
 /*
   handle a read event on the pipe
 */
-static void pipe_handler(struct event_context *ev, struct fd_event *fde, 
+static void pipe_handler(struct tevent_context *ev, struct tevent_fd *fde, 
 			 uint16_t flags, void *private_data)
 {
 	struct composite_context *c = talloc_get_type(private_data, struct composite_context);
@@ -436,7 +436,7 @@ static void pipe_handler(struct event_context *ev, struct fd_event *fde,
   getaddrinfo() or dns_lookup() name resolution method - async send
  */
 struct composite_context *resolve_name_dns_ex_send(TALLOC_CTX *mem_ctx,
-						   struct event_context *event_ctx,
+						   struct tevent_context *event_ctx,
 						   void *privdata,
 						   uint32_t flags,
 						   uint16_t port,
diff --git a/source4/libcli/resolve/host.c b/source4/libcli/resolve/host.c
index b7eaf4bef5..755a4e8304 100644
--- a/source4/libcli/resolve/host.c
+++ b/source4/libcli/resolve/host.c
@@ -33,7 +33,7 @@
   getaddrinfo() (with fallback to dns_lookup()) name resolution method - async send
  */
 struct composite_context *resolve_name_host_send(TALLOC_CTX *mem_ctx,
-						 struct event_context *event_ctx,
+						 struct tevent_context *event_ctx,
 						 void *privdata, uint32_t flags,
 						 uint16_t port,
 						 struct nbt_name *name)
diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c
index 734fd5a5bc..73085b87cb 100644
--- a/source4/libcli/resolve/nbtlist.c
+++ b/source4/libcli/resolve/nbtlist.c
@@ -107,7 +107,7 @@ static void nbtlist_handler(struct nbt_name_request *req)
   nbtlist name resolution method - async send
  */
 struct composite_context *resolve_name_nbtlist_send(TALLOC_CTX *mem_ctx,
-						    struct event_context *event_ctx,
+						    struct tevent_context *event_ctx,
 						    uint32_t flags,
 						    uint16_t port,
 						    struct nbt_name *name, 
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index 752678abb8..6a3d5daecc 100644
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -139,7 +139,7 @@ struct composite_context *resolve_name_all_send(struct resolve_context *ctx,
 						uint32_t flags,
 						uint16_t port,
 						struct nbt_name *name,
-						struct event_context *event_ctx)
+						struct tevent_context *event_ctx)
 {
 	struct composite_context *c;
 	struct resolve_state *state;
@@ -222,7 +222,7 @@ NTSTATUS resolve_name_all_recv(struct composite_context *c,
 
 struct composite_context *resolve_name_send(struct resolve_context *ctx,
 					    struct nbt_name *name,
-					    struct event_context *event_ctx)
+					    struct tevent_context *event_ctx)
 {
 	return resolve_name_all_send(ctx, 0, 0, name, event_ctx);
 }
@@ -251,7 +251,7 @@ NTSTATUS resolve_name(struct resolve_context *ctx,
 			  struct nbt_name *name,
 			  TALLOC_CTX *mem_ctx,
 			  const char **reply_addr,
-			  struct event_context *ev)
+			  struct tevent_context *ev)
 {
 	struct composite_context *c = resolve_name_send(ctx, name, ev);
 	return resolve_name_recv(c, mem_ctx, reply_addr);
diff --git a/source4/libcli/resolve/resolve.h b/source4/libcli/resolve/resolve.h
index b55ab83f2a..8ace5740a9 100644
--- a/source4/libcli/resolve/resolve.h
+++ b/source4/libcli/resolve/resolve.h
@@ -23,7 +23,7 @@
 #define __LIBCLI_RESOLVE_H__
 
 struct socket_address;
-struct event_context;
+struct tevent_context;
 
 #include "../libcli/nbt/libnbt.h"
 
@@ -37,7 +37,7 @@ struct event_context;
 #define RESOLVE_NAME_FLAG_OVERWRITE_PORT	0x00000008
 
 typedef struct composite_context *(*resolve_name_send_fn)(TALLOC_CTX *mem_ctx,
-							  struct event_context *,
+							  struct tevent_context *,
 							  void *privdata,
 							  uint32_t flags,
 							  uint16_t port,
diff --git a/source4/libcli/resolve/testsuite.c b/source4/libcli/resolve/testsuite.c
index f1d1fbc85c..fdbb430a9f 100644
--- a/source4/libcli/resolve/testsuite.c
+++ b/source4/libcli/resolve/testsuite.c
@@ -28,7 +28,7 @@
 static bool test_async_resolve(struct torture_context *tctx)
 {
 	struct nbt_name n;
-	struct event_context *ev;
+	struct tevent_context *ev;
 	int timelimit = torture_setting_int(tctx, "timelimit", 2);
 	const char *host = torture_setting_string(tctx, "host", NULL);
 	int count = 0;
diff --git a/source4/libcli/resolve/wins.c b/source4/libcli/resolve/wins.c
index 1940688ecb..03eaf8786f 100644
--- a/source4/libcli/resolve/wins.c
+++ b/source4/libcli/resolve/wins.c
@@ -38,7 +38,7 @@ struct resolve_wins_data {
  */
 struct composite_context *resolve_name_wins_send(
 				TALLOC_CTX *mem_ctx, 
-				struct event_context *event_ctx,
+				struct tevent_context *event_ctx,
 				void *userdata,
 				uint32_t flags,
 				uint16_t port,