8 files changed, 13 insertions, 13 deletions
diff --git a/source4/dsdb/common/sidmap.c b/source4/dsdb/common/sidmap.c
index 31b56ea52f..5c20149384 100644
--- a/source4/dsdb/common/sidmap.c
+++ b/source4/dsdb/common/sidmap.c
@@ -49,7 +49,7 @@ struct sidmap_context {
 /*
   open a sidmap context - use talloc_free to close
 */
-struct sidmap_context *sidmap_open(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx, 
+struct sidmap_context *sidmap_open(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, 
 				   struct loadparm_context *lp_ctx)
 {
 	struct sidmap_context *sidmap;
diff --git a/source4/dsdb/repl/drepl_periodic.c b/source4/dsdb/repl/drepl_periodic.c
index 7205c8b0f1..4a6de8d700 100644
--- a/source4/dsdb/repl/drepl_periodic.c
+++ b/source4/dsdb/repl/drepl_periodic.c
@@ -34,7 +34,7 @@
 
 static void dreplsrv_periodic_run(struct dreplsrv_service *service);
 
-static void dreplsrv_periodic_handler_te(struct event_context *ev, struct timed_event *te,
+static void dreplsrv_periodic_handler_te(struct tevent_context *ev, struct tevent_timer *te,
 					 struct timeval t, void *ptr)
 {
 	struct dreplsrv_service *service = talloc_get_type(ptr, struct dreplsrv_service);
@@ -54,7 +54,7 @@ static void dreplsrv_periodic_handler_te(struct event_context *ev, struct timed_
 WERROR dreplsrv_periodic_schedule(struct dreplsrv_service *service, uint32_t next_interval)
 {
 	TALLOC_CTX *tmp_mem;
-	struct timed_event *new_te;
+	struct tevent_timer *new_te;
 	struct timeval next_time;
 
 	/* prevent looping */
diff --git a/source4/dsdb/repl/drepl_service.h b/source4/dsdb/repl/drepl_service.h
index 0847a016f7..a9eea30719 100644
--- a/source4/dsdb/repl/drepl_service.h
+++ b/source4/dsdb/repl/drepl_service.h
@@ -147,7 +147,7 @@ struct dreplsrv_service {
 		struct timeval next_event;
 
 		/* here we have a reference to the timed event the schedules the periodic stuff */
-		struct timed_event *te;
+		struct tevent_timer *te;
 	} periodic;
 
 	/*
diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index 916dc943be..9bcb007358 100644
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -1232,7 +1232,7 @@ NTSTATUS crack_service_principal_name(struct ldb_context *sam_ctx,
 }
 
 NTSTATUS crack_name_to_nt4_name(TALLOC_CTX *mem_ctx, 
-				struct event_context *ev_ctx, 
+				struct tevent_context *ev_ctx, 
 				struct loadparm_context *lp_ctx,
 				uint32_t format_offered,
 				const char *name, 
@@ -1295,7 +1295,7 @@ NTSTATUS crack_name_to_nt4_name(TALLOC_CTX *mem_ctx,
 }
 
 NTSTATUS crack_auto_name_to_nt4_name(TALLOC_CTX *mem_ctx,
-				     struct event_context *ev_ctx, 
+				     struct tevent_context *ev_ctx, 
 				     struct loadparm_context *lp_ctx,
 				     const char *name,
 				     const char **nt4_domain,
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 7ecc41d2c3..5ab577c33d 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -197,7 +197,7 @@ done:
 
 static int samldb_search_template(struct samldb_ctx *ac)
 {
-	struct event_context *ev;
+	struct tevent_context *ev;
 	struct loadparm_context *lparm_ctx;
 	struct ldb_context *templates_ldb;
 	char *templates_ldb_path;
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index f75ea3c4f7..98ca6d03a1 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -70,7 +70,7 @@ char *samdb_relative_path(struct ldb_context *ldb,
 }
 
 struct cli_credentials *samdb_credentials(TALLOC_CTX *mem_ctx, 
-					  struct event_context *event_ctx, 
+					  struct tevent_context *event_ctx, 
 					  struct loadparm_context *lp_ctx) 
 {
 	struct cli_credentials *cred = cli_credentials_init(mem_ctx);
@@ -97,7 +97,7 @@ struct cli_credentials *samdb_credentials(TALLOC_CTX *mem_ctx,
   return an opaque context pointer on success, or NULL on failure
  */
 struct ldb_context *samdb_connect(TALLOC_CTX *mem_ctx, 
-				  struct event_context *ev_ctx,
+				  struct tevent_context *ev_ctx,
 				  struct loadparm_context *lp_ctx,
 				  struct auth_session_info *session_info)
 {
@@ -126,7 +126,7 @@ int samdb_copy_template(struct ldb_context *ldb,
 	struct ldb_context *templates_ldb;
 	char *templates_ldb_path; 
 	struct ldb_dn *basedn;
-	struct event_context *event_ctx;
+	struct tevent_context *event_ctx;
 	struct loadparm_context *lp_ctx;
 
 	templates_ldb = talloc_get_type(ldb_get_opaque(ldb, "templates_ldb"), struct ldb_context);
@@ -223,7 +223,7 @@ int samdb_copy_template(struct ldb_context *ldb,
  Create the SID list for this user.
 ****************************************************************************/
 NTSTATUS security_token_create(TALLOC_CTX *mem_ctx, 
-			       struct event_context *ev_ctx, 
+			       struct tevent_context *ev_ctx, 
 			       struct loadparm_context *lp_ctx,
 			       struct dom_sid *user_sid,
 			       struct dom_sid *group_sid, 
diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h
index efc467865c..49dc14d74c 100644
--- a/source4/dsdb/samdb/samdb.h
+++ b/source4/dsdb/samdb/samdb.h
@@ -27,7 +27,7 @@ struct dsdb_control_current_partition;
 struct dsdb_extended_replicated_object;
 struct dsdb_extended_replicated_objects;
 struct loadparm_context;
-struct event_context;
+struct tevent_context;
 
 #include "librpc/gen_ndr/security.h"
 #include "lib/ldb/include/ldb.h"
diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c
index d4ef79aac1..e9c6f4c527 100644
--- a/source4/dsdb/samdb/samdb_privilege.c
+++ b/source4/dsdb/samdb/samdb_privilege.c
@@ -73,7 +73,7 @@ static NTSTATUS samdb_privilege_setup_sid(void *samctx, TALLOC_CTX *mem_ctx,
   setup the privilege mask for this security token based on our
   local SAM
 */
-NTSTATUS samdb_privilege_setup(struct event_context *ev_ctx, 
+NTSTATUS samdb_privilege_setup(struct tevent_context *ev_ctx, 
 			       struct loadparm_context *lp_ctx, struct security_token *token)
 {
 	void *samctx;