s4:lib/tevent: rename structs

list=""
list="$list event_context:tevent_context"
list="$list fd_event:tevent_fd"
list="$list timed_event:tevent_timer"

for s in $list; do
	o=`echo $s | cut -d ':' -f1`
	n=`echo $s | cut -d ':' -f2`
	r=`git grep "struct $o" |cut -d ':' -f1 |sort -u`
	files=`echo "$r" | grep -v source3 | grep -v nsswitch | grep -v packaging4`
	for f in $files; do
		cat $f | sed -e "s/struct $o/struct $n/g" > $f.tmp
		mv $f.tmp $f
	done
done

metze

33 files changed, 82 insertions, 82 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 *, 
diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index dda05c8d73..14935dadba 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -32,7 +32,7 @@
 */
 bool smbcli_socket_connect(struct smbcli_state *cli, const char *server, 
 			   const char **ports, 
-			   struct event_context *ev_ctx,
+			   struct tevent_context *ev_ctx,
 			   struct resolve_context *resolve_ctx,
 			   struct smbcli_options *options,
 			   struct smb_iconv_convenience *iconv_convenience,
@@ -151,7 +151,7 @@ NTSTATUS smbcli_full_connection(TALLOC_CTX *parent_ctx,
 				const char *socket_options,
 				struct cli_credentials *credentials,
 				struct resolve_context *resolve_ctx,
-				struct event_context *ev,
+				struct tevent_context *ev,
 				struct smbcli_options *options,
 				struct smbcli_session_options *session_options,
 				struct smb_iconv_convenience *iconv_convenience,
diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c
index 104397fa48..aff8f79481 100644
--- a/source4/libcli/composite/composite.c
+++ b/source4/libcli/composite/composite.c
@@ -35,7 +35,7 @@
  and initialize it
 */
 _PUBLIC_ struct composite_context *composite_create(TALLOC_CTX *mem_ctx,
-						    struct event_context *ev)
+						    struct tevent_context *ev)
 {
 	struct composite_context *c;
 
@@ -93,7 +93,7 @@ _PUBLIC_ NTSTATUS composite_wait_free(struct composite_context *c)
    and allows the caller to ignore the fact that the composite
    function completed early
 */
-static void composite_trigger(struct event_context *ev, struct timed_event *te,
+static void composite_trigger(struct tevent_context *ev, struct tevent_timer *te,
 			      struct timeval t, void *ptr)
 {
 	struct composite_context *c = talloc_get_type(ptr, struct composite_context);
diff --git a/source4/libcli/composite/composite.h b/source4/libcli/composite/composite.h
index 25799d6a94..a99a762c5f 100644
--- a/source4/libcli/composite/composite.h
+++ b/source4/libcli/composite/composite.h
@@ -24,7 +24,7 @@
 
 #include "libcli/raw/interfaces.h"
 
-struct event_context;
+struct tevent_context;
 
 /*
   this defines the structures associated with "composite"
@@ -56,7 +56,7 @@ struct composite_context {
 	NTSTATUS status;
 
 	/* the event context we are using */
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 
 	/* information on what to do on completion */
 	struct {
@@ -73,7 +73,7 @@ struct smb2_request;
 struct rpc_request;
 struct nbt_name_request;
 
-struct composite_context *composite_create(TALLOC_CTX *mem_ctx, struct event_context *ev);
+struct composite_context *composite_create(TALLOC_CTX *mem_ctx, struct tevent_context *ev);
 bool composite_nomem(const void *p, struct composite_context *ctx);
 void composite_continue(struct composite_context *ctx,
 				 struct composite_context *new_ctx,
diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c
index 9d00623081..5c878f19fa 100644
--- a/source4/libcli/dgram/dgramsocket.c
+++ b/source4/libcli/dgram/dgramsocket.c
@@ -139,7 +139,7 @@ static void dgm_socket_send(struct nbt_dgram_socket *dgmsock)
 /*
   handle fd events on a nbt_dgram_socket
 */
-static void dgm_socket_handler(struct event_context *ev, struct fd_event *fde,
+static void dgm_socket_handler(struct tevent_context *ev, struct tevent_fd *fde,
 			       uint16_t flags, void *private)
 {
 	struct nbt_dgram_socket *dgmsock = talloc_get_type(private, 
@@ -157,7 +157,7 @@ static void dgm_socket_handler(struct event_context *ev, struct fd_event *fde,
   then operations will use that event context
 */
 struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx, 
-					      struct event_context *event_ctx,
+					      struct tevent_context *event_ctx,
 					      struct smb_iconv_convenience *iconv_convenience)
 {
 	struct nbt_dgram_socket *dgmsock;
diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h
index 2f8feb5345..8060d8cf53 100644
--- a/source4/libcli/dgram/libdgram.h
+++ b/source4/libcli/dgram/libdgram.h
@@ -39,11 +39,11 @@ struct nbt_dgram_request {
 */
 struct nbt_dgram_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 nbt_dgram_request *send_queue;
@@ -93,7 +93,7 @@ NTSTATUS dgram_set_incoming_handler(struct nbt_dgram_socket *dgmsock,
 						    struct socket_address *),
 				    void *private);
 struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx, 
-					       struct event_context *event_ctx,
+					       struct tevent_context *event_ctx,
 					       struct smb_iconv_convenience *);
 
 const char *dgram_mailslot_name(struct nbt_dgram_packet *packet);
diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c
index 5352a3a90a..6e531391a6 100644
--- a/source4/libcli/finddcs.c
+++ b/source4/libcli/finddcs.c
@@ -70,7 +70,7 @@ struct composite_context *finddcs_send(TALLOC_CTX *mem_ctx,
 				       struct dom_sid *domain_sid,
 				       struct smb_iconv_convenience *iconv_convenience,
 				       struct resolve_context *resolve_ctx,
-				       struct event_context *event_ctx,
+				       struct tevent_context *event_ctx,
 				       struct messaging_context *msg_ctx)
 {
 	struct composite_context *c, *creq;
@@ -260,7 +260,7 @@ NTSTATUS finddcs(TALLOC_CTX *mem_ctx,
 		 struct dom_sid *domain_sid,
 		 struct smb_iconv_convenience *iconv_convenience,
 		 struct resolve_context *resolve_ctx,
-		 struct event_context *event_ctx,
+		 struct tevent_context *event_ctx,
 		 struct messaging_context *msg_ctx,
 		 int *num_dcs, struct nbt_dc_name **dcs)
 {
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,
diff --git a/source4/libcli/libcli.h b/source4/libcli/libcli.h
index a4bd727f4c..e729e12721 100644
--- a/source4/libcli/libcli.h
+++ b/source4/libcli/libcli.h
@@ -51,7 +51,7 @@ struct nbt_dc_name {
 };
 
 struct cli_credentials;
-struct event_context;
+struct tevent_context;
 
 /* passed to br lock code. */
 enum brl_type {
diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index 1fbbfe3581..b9e83218dd 100644
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -50,7 +50,7 @@ struct composite_context *smbcli_sock_connect_send(TALLOC_CTX *mem_ctx,
 						   const char **ports,
 						   const char *host_name,
 						   struct resolve_context *resolve_ctx,
-						   struct event_context *event_ctx,
+						   struct tevent_context *event_ctx,
 						   const char *socket_options)
 {
 	struct composite_context *result, *ctx;
@@ -153,7 +153,7 @@ NTSTATUS smbcli_sock_connect(TALLOC_CTX *mem_ctx,
 			     const char *host_addr, const char **ports,
 			     const char *host_name,
 			     struct resolve_context *resolve_ctx,
-			     struct event_context *event_ctx,
+			     struct tevent_context *event_ctx,
 				 const char *socket_options,
 			     struct smbcli_socket **result)
 {
@@ -190,7 +190,7 @@ resolve a hostname and connect
 _PUBLIC_ struct smbcli_socket *smbcli_sock_connect_byname(const char *host, const char **ports,
 						 TALLOC_CTX *mem_ctx,
 						 struct resolve_context *resolve_ctx,
-						 struct event_context *event_ctx,
+						 struct tevent_context *event_ctx,
 						 const char *socket_options)
 {
 	int name_type = NBT_NAME_SERVER;
diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index 502ecc1825..22e2552edc 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -33,8 +33,8 @@
 /*
   an event has happened on the socket
 */
-static void smbcli_transport_event_handler(struct event_context *ev, 
-					   struct fd_event *fde, 
+static void smbcli_transport_event_handler(struct tevent_context *ev, 
+					   struct tevent_fd *fde, 
 					   uint16_t flags, void *private)
 {
 	struct smbcli_transport *transport = talloc_get_type(private,
@@ -307,8 +307,8 @@ again:
 	return mid;
 }
 
-static void idle_handler(struct event_context *ev, 
-			 struct timed_event *te, struct timeval t, void *private)
+static void idle_handler(struct tevent_context *ev, 
+			 struct tevent_timer *te, struct timeval t, void *private)
 {
 	struct smbcli_transport *transport = talloc_get_type(private,
 							     struct smbcli_transport);
@@ -541,7 +541,7 @@ _PUBLIC_ bool smbcli_transport_process(struct smbcli_transport *transport)
 /*
   handle timeouts of individual smb requests
 */
-static void smbcli_timeout_handler(struct event_context *ev, struct timed_event *te, 
+static void smbcli_timeout_handler(struct tevent_context *ev, struct tevent_timer *te, 
 				   struct timeval t, void *private)
 {
 	struct smbcli_request *req = talloc_get_type(private, struct smbcli_request);
diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index 984aa70247..a083396f35 100644
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -176,7 +176,7 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
 					 const char *socket_options,
 				     struct cli_credentials *credentials,
 				     struct resolve_context *resolve_ctx,
-				     struct event_context *ev,
+				     struct tevent_context *ev,
 				     struct smbcli_options *options,
 				     struct smbcli_session_options *session_options,
 					 struct smb_iconv_convenience *iconv_convenience,
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index 7757d10099..0ab6f5650c 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -81,9 +81,9 @@ struct smbcli_socket {
 
 	/* the event handle for waiting for socket IO */
 	struct {
-		struct event_context *ctx;
-		struct fd_event *fde;
-		struct timed_event *te;
+		struct tevent_context *ctx;
+		struct tevent_fd *fde;
+		struct tevent_timer *te;
 	} event;
 };
 
@@ -377,7 +377,7 @@ NTSTATUS smb_raw_trans(struct smbcli_tree *tree,
 struct smbcli_socket *smbcli_sock_connect_byname(const char *host, const char **ports,
 						 TALLOC_CTX *mem_ctx,
 						 struct resolve_context *resolve_ctx,
-						 struct event_context *event_ctx,
+						 struct tevent_context *event_ctx,
 						 const char *socket_options);
 void smbcli_sock_dead(struct smbcli_socket *sock);
 
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,
diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index c7613841b8..11bec42737 100644
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -235,7 +235,7 @@ struct composite_context *smb2_connect_send(TALLOC_CTX *mem_ctx,
 					    const char *share,
 					    struct resolve_context *resolve_ctx,
 					    struct cli_credentials *credentials,
-					    struct event_context *ev,
+					    struct tevent_context *ev,
 					    struct smbcli_options *options,
 						const char *socket_options,
 						struct gensec_settings *gensec_settings)
@@ -297,7 +297,7 @@ NTSTATUS smb2_connect(TALLOC_CTX *mem_ctx,
 		      struct resolve_context *resolve_ctx,
 		      struct cli_credentials *credentials,
 		      struct smb2_tree **tree,
-		      struct event_context *ev,
+		      struct tevent_context *ev,
 		      struct smbcli_options *options,
 			  const char *socket_options,
 			  struct gensec_settings *gensec_settings)
diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h
index ec246b209d..b89770fbe6 100644
--- a/source4/libcli/smb2/smb2_calls.h
+++ b/source4/libcli/smb2/smb2_calls.h
@@ -105,7 +105,7 @@ struct smb2_setinfo {
 };
 
 struct cli_credentials;
-struct event_context;
+struct tevent_context;
 struct resolve_context;
 struct gensec_settings;
 #include "libcli/smb2/smb2_proto.h"
diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c
index 6d7531f4b5..94ea2586ef 100644
--- a/source4/libcli/smb2/transport.c
+++ b/source4/libcli/smb2/transport.c
@@ -33,8 +33,8 @@
 /*
   an event has happened on the socket
 */
-static void smb2_transport_event_handler(struct event_context *ev, 
-					 struct fd_event *fde, 
+static void smb2_transport_event_handler(struct tevent_context *ev, 
+					 struct tevent_fd *fde, 
 					 uint16_t flags, void *private)
 {
 	struct smb2_transport *transport = talloc_get_type(private,
@@ -301,7 +301,7 @@ error:
 /*
   handle timeouts of individual smb requests
 */
-static void smb2_timeout_handler(struct event_context *ev, struct timed_event *te, 
+static void smb2_timeout_handler(struct tevent_context *ev, struct tevent_timer *te, 
 				 struct timeval t, void *private)
 {
 	struct smb2_request *req = talloc_get_type(private, struct smb2_request);
@@ -380,8 +380,8 @@ void smb2_transport_send(struct smb2_request *req)
 	talloc_set_destructor(req, smb2_request_destructor);
 }
 
-static void idle_handler(struct event_context *ev, 
-			 struct timed_event *te, struct timeval t, void *private)
+static void idle_handler(struct tevent_context *ev, 
+			 struct tevent_timer *te, struct timeval t, void *private)
 {
 	struct smb2_transport *transport = talloc_get_type(private,
 							   struct smb2_transport);
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index 980a418619..e0f4919f0b 100644
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -455,7 +455,7 @@ static void composite_handler(struct composite_context *creq)
 struct composite_context *smb_composite_connect_send(struct smb_composite_connect *io,
 						     TALLOC_CTX *mem_ctx,
 						     struct resolve_context *resolve_ctx,
-						     struct event_context *event_ctx)
+						     struct tevent_context *event_ctx)
 {
 	struct composite_context *c;
 	struct connect_state *state;
@@ -513,7 +513,7 @@ NTSTATUS smb_composite_connect_recv(struct composite_context *c, TALLOC_CTX *mem
 */
 NTSTATUS smb_composite_connect(struct smb_composite_connect *io, TALLOC_CTX *mem_ctx,
 			       struct resolve_context *resolve_ctx,
-			       struct event_context *ev)
+			       struct tevent_context *ev)
 {
 	struct composite_context *c = smb_composite_connect_send(io, mem_ctx, resolve_ctx, ev);
 	return smb_composite_connect_recv(c, mem_ctx);
diff --git a/source4/libcli/smb_composite/fetchfile.c b/source4/libcli/smb_composite/fetchfile.c
index a19898efae..210a2940b9 100644
--- a/source4/libcli/smb_composite/fetchfile.c
+++ b/source4/libcli/smb_composite/fetchfile.c
@@ -120,7 +120,7 @@ static void fetchfile_composite_handler(struct composite_context *creq)
 }
 
 struct composite_context *smb_composite_fetchfile_send(struct smb_composite_fetchfile *io,
-						       struct event_context *event_ctx)
+						       struct tevent_context *event_ctx)
 {
 	struct composite_context *c;
 	struct fetchfile_state *state;
diff --git a/source4/libcli/wbclient/wbclient.c b/source4/libcli/wbclient/wbclient.c
index 1b2d314824..b881e32f7b 100644
--- a/source4/libcli/wbclient/wbclient.c
+++ b/source4/libcli/wbclient/wbclient.c
@@ -50,7 +50,7 @@ static NTSTATUS get_server_id(struct messaging_context *msg_ctx,
  */
 struct wbc_context *wbc_init(TALLOC_CTX *mem_ctx,
 			     struct messaging_context *msg_ctx,
-			     struct event_context *event_ctx)
+			     struct tevent_context *event_ctx)
 {
 	struct wbc_context *ctx;
 	NTSTATUS status;
diff --git a/source4/libcli/wbclient/wbclient.h b/source4/libcli/wbclient/wbclient.h
index 099abaa511..416dc78324 100644
--- a/source4/libcli/wbclient/wbclient.h
+++ b/source4/libcli/wbclient/wbclient.h
@@ -24,13 +24,13 @@
 
 struct wbc_context {
 	struct messaging_context *msg_ctx;
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 	struct server_id *ids;
 };
 
 struct wbc_context *wbc_init(TALLOC_CTX *mem_ctx,
 			     struct messaging_context *msg_ctx,
-			     struct event_context *event_ctx);
+			     struct tevent_context *event_ctx);
 
 struct composite_context *wbc_sids_to_xids_send(struct wbc_context *wbc_ctx,
 						TALLOC_CTX *mem_ctx,
diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index 930616d211..c063a4bc6d 100644
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -71,7 +71,7 @@ static void wrepl_socket_dead(struct wrepl_socket *wrepl_socket, NTSTATUS status
 	}
 }
 
-static void wrepl_request_timeout_handler(struct event_context *ev, struct timed_event *te,
+static void wrepl_request_timeout_handler(struct tevent_context *ev, struct tevent_timer *te,
 					  struct timeval t, void *ptr)
 {
 	struct wrepl_request *req = talloc_get_type(ptr, struct wrepl_request);
@@ -122,7 +122,7 @@ static NTSTATUS wrepl_finish_recv(void *private, DATA_BLOB packet_blob_in)
 /*
   handler for winrepl events
 */
-static void wrepl_handler(struct event_context *ev, struct fd_event *fde, 
+static void wrepl_handler(struct tevent_context *ev, struct tevent_fd *fde, 
 			  uint16_t flags, void *private)
 {
 	struct wrepl_socket *wrepl_socket = talloc_get_type(private, 
@@ -162,7 +162,7 @@ static int wrepl_socket_destructor(struct wrepl_socket *sock)
   operations will use that event context
 */
 struct wrepl_socket *wrepl_socket_init(TALLOC_CTX *mem_ctx, 
-				       struct event_context *event_ctx,
+				       struct tevent_context *event_ctx,
 				       struct smb_iconv_convenience *iconv_convenience)
 {
 	struct wrepl_socket *wrepl_socket;
@@ -196,7 +196,7 @@ failed:
   initialise a wrepl_socket from an already existing connection
 */
 struct wrepl_socket *wrepl_socket_merge(TALLOC_CTX *mem_ctx, 
-				        struct event_context *event_ctx,
+				        struct tevent_context *event_ctx,
 					struct socket_context *sock,
 					struct packet_context *pack)
 {
@@ -381,7 +381,7 @@ NTSTATUS wrepl_connect(struct wrepl_socket *wrepl_socket,
 /* 
    callback from wrepl_request_trigger() 
 */
-static void wrepl_request_trigger_handler(struct event_context *ev, struct timed_event *te,
+static void wrepl_request_trigger_handler(struct tevent_context *ev, struct tevent_timer *te,
 					  struct timeval t, void *ptr)
 {
 	struct wrepl_request *req = talloc_get_type(ptr, struct wrepl_request);
@@ -397,7 +397,7 @@ static void wrepl_request_trigger_handler(struct event_context *ev, struct timed
 */
 static struct wrepl_request *wrepl_request_finished(struct wrepl_request *req, NTSTATUS status)
 {
-	struct timed_event *te;
+	struct tevent_timer *te;
 
 	if (req->state == WREPL_REQUEST_RECV) {
 		DLIST_REMOVE(req->wrepl_socket->recv_queue, req);
diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h
index f33e63119d..532496d387 100644
--- a/source4/libcli/wrepl/winsrepl.h
+++ b/source4/libcli/wrepl/winsrepl.h
@@ -30,8 +30,8 @@ struct wrepl_socket {
 	struct packet_context *packet;
 
 	struct {
-		struct event_context *ctx;
-		struct fd_event *fde;
+		struct tevent_context *ctx;
+		struct tevent_fd *fde;
 	} event;
 
 	/* a queue of replies waiting to be received */
@@ -76,7 +76,7 @@ struct wrepl_request {
 	bool trigger;
 	NTSTATUS status;
 
-	struct timed_event *te;
+	struct tevent_timer *te;
 
 	struct wrepl_packet *packet;