s3:events: change event_add_timed() prototype to match samba4

metze

3 files changed, 8 insertions, 27 deletions

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index b2b7628873..e5e3565604 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -272,7 +272,7 @@ static bool fork_child_dc_connect(struct winbindd_domain *domain)
 
 static void check_domain_online_handler(struct event_context *ctx,
 					struct timed_event *te,
-					const struct timeval *now,
+					struct timeval now,
 					void *private_data)
 {
         struct winbindd_domain *domain =
@@ -286,7 +286,7 @@ static void check_domain_online_handler(struct event_context *ctx,
 
 	/* Are we still in "startup" mode ? */
 
-	if (domain->startup && (now->tv_sec > domain->startup_time + 30)) {
+	if (domain->startup && (now.tv_sec > domain->startup_time + 30)) {
 		/* No longer in "startup" mode. */
 		DEBUG(10,("check_domain_online_handler: domain %s no longer in 'startup' mode.\n",
 			domain->name ));
@@ -367,7 +367,6 @@ void set_domain_offline(struct winbindd_domain *domain)
 	domain->check_online_event = event_add_timed(winbind_event_context(),
 						NULL,
 						timeval_current_ofs(domain->check_online_timeout,0),
-						"check_domain_online_handler",
 						check_domain_online_handler,
 						domain);
 
@@ -518,7 +517,6 @@ void set_domain_online_request(struct winbindd_domain *domain)
 	domain->check_online_event = event_add_timed(winbind_event_context(),
 						     NULL,
 						     tev,
-						     "check_domain_online_handler",
 						     check_domain_online_handler,
 						     domain);
 
diff --git a/source3/winbindd/winbindd_cred_cache.c b/source3/winbindd/winbindd_cred_cache.c
index c869544048..900f9acdfa 100644
--- a/source3/winbindd/winbindd_cred_cache.c
+++ b/source3/winbindd/winbindd_cred_cache.c
@@ -36,7 +36,7 @@
 static struct WINBINDD_CCACHE_ENTRY *ccache_list;
 static void krb5_ticket_gain_handler(struct event_context *,
 				     struct timed_event *,
-				     const struct timeval *,
+				     struct timeval,
 				     void *);
 
 /* The Krb5 ticket refresh handler should be scheduled
@@ -95,7 +95,7 @@ void ccache_remove_all_after_fork(void)
 
 static void krb5_ticket_refresh_handler(struct event_context *event_ctx,
 					struct timed_event *te,
-					const struct timeval *now,
+					struct timeval now,
 					void *private_data)
 {
 	struct WINBINDD_CCACHE_ENTRY *entry =
@@ -163,7 +163,6 @@ rekinit:
 					entry->event = event_add_timed(winbind_event_context(),
 								       entry, 
 								       timeval_set(new_start, 0),
-								       "krb5_ticket_gain_handler",
 								       krb5_ticket_gain_handler,
 								       entry);
 					return;
@@ -242,7 +241,6 @@ rekinit:
 			entry->event = event_add_timed(winbind_event_context(),
 							entry,
 							timeval_set(new_start, 0),
-							"krb5_ticket_gain_handler",
 							krb5_ticket_gain_handler,
 							entry);
 			return;
@@ -275,7 +273,6 @@ done:
 		expire_time -= 10;
 		entry->event = event_add_timed(winbind_event_context(), entry,
 						timeval_set(expire_time, 0),
-						"krb5_ticket_gain_handler",
 						krb5_ticket_gain_handler,
 						entry);
 		return;
@@ -286,7 +283,6 @@ done:
 	}
 	entry->event = event_add_timed(winbind_event_context(), entry,
 				       timeval_set(new_start, 0),
-				       "krb5_ticket_refresh_handler",
 				       krb5_ticket_refresh_handler,
 				       entry);
 
@@ -299,7 +295,7 @@ done:
 
 static void krb5_ticket_gain_handler(struct event_context *event_ctx,
 				     struct timed_event *te,
-				     const struct timeval *now,
+				     struct timeval now,
 				     void *private_data)
 {
 	struct WINBINDD_CCACHE_ENTRY *entry =
@@ -375,7 +371,6 @@ static void krb5_ticket_gain_handler(struct event_context *event_ctx,
 	entry->event = event_add_timed(winbind_event_context(),
 				       entry,
 				       t,
-				       "krb5_ticket_gain_handler",
 				       krb5_ticket_gain_handler,
 				       entry);
 
@@ -395,7 +390,6 @@ static void krb5_ticket_gain_handler(struct event_context *event_ctx,
 	entry->event = event_add_timed(winbind_event_context(),
 				       entry,
 				       t,
-				       "krb5_ticket_refresh_handler",
 				       krb5_ticket_refresh_handler,
 				       entry);
 
@@ -419,14 +413,12 @@ void ccache_regain_all_now(void)
 			new_event = event_add_timed(winbind_event_context(),
 						    cur,
 						    t,
-						    "krb5_ticket_gain_handler",
 						    krb5_ticket_gain_handler,
 						    cur);
 		} else {
 			new_event = event_add_timed(winbind_event_context(),
 						    cur,
 						    t,
-						    "krb5_ticket_refresh_handler",
 						    krb5_ticket_refresh_handler,
 						    cur);
 		}
@@ -556,7 +548,6 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
 				entry->event = event_add_timed(winbind_event_context(),
 							       entry,
 							       t,
-							       "krb5_ticket_gain_handler",
 							       krb5_ticket_gain_handler,
 							       entry);
 			} else {
@@ -569,7 +560,6 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
 				entry->event = event_add_timed(winbind_event_context(),
 							       entry,
 							       t,
-							       "krb5_ticket_refresh_handler",
 							       krb5_ticket_refresh_handler,
 							       entry);
 			}
@@ -644,7 +634,6 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
 		entry->event = event_add_timed(winbind_event_context(),
 					       entry,
 					       t,
-					       "krb5_ticket_gain_handler",
 					       krb5_ticket_gain_handler,
 					       entry);
 	} else {
@@ -660,7 +649,6 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
 		entry->event = event_add_timed(winbind_event_context(),
 					       entry,
 					       t,
-					       "krb5_ticket_refresh_handler",
 					       krb5_ticket_refresh_handler,
 					       entry);
 	}
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index b6af796a87..1499141c34 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -175,7 +175,7 @@ static void async_main_request_sent(void *private_data, bool success)
 
 static void async_request_timeout_handler(struct event_context *ctx,
 					struct timed_event *te,
-					const struct timeval *now,
+					struct timeval now,
 					void *private_data)
 {
 	struct winbindd_async_request *state =
@@ -247,7 +247,6 @@ static void async_request_sent(void *private_data_data, bool success)
 	state->reply_timeout_event = event_add_timed(winbind_event_context(),
 							NULL,
 							timeval_current_ofs(300,0),
-							"async_request_timeout",
 							async_request_timeout_handler,
 							state);
 	if (!state->reply_timeout_event) {
@@ -827,7 +826,7 @@ void winbind_msg_dump_domain_list(struct messaging_context *msg_ctx,
 
 static void account_lockout_policy_handler(struct event_context *ctx,
 					   struct timed_event *te,
-					   const struct timeval *now,
+					   struct timeval now,
 					   void *private_data)
 {
 	struct winbindd_child *child =
@@ -866,7 +865,6 @@ static void account_lockout_policy_handler(struct event_context *ctx,
 
 	child->lockout_policy_event = event_add_timed(winbind_event_context(), NULL,
 						      timeval_current_ofs(3600, 0),
-						      "account_lockout_policy_handler",
 						      account_lockout_policy_handler,
 						      child);
 }
@@ -919,7 +917,7 @@ static bool calculate_next_machine_pwd_change(const char *domain,
 
 static void machine_password_change_handler(struct event_context *ctx,
 					    struct timed_event *te,
-					    const struct timeval *now,
+					    struct timeval now,
 					    void *private_data)
 {
 	struct winbindd_child *child =
@@ -971,7 +969,6 @@ static void machine_password_change_handler(struct event_context *ctx,
 
 	child->machine_password_change_event = event_add_timed(winbind_event_context(), NULL,
 							      next_change,
-							      "machine_password_change_handler",
 							      machine_password_change_handler,
 							      child);
 }
@@ -1293,7 +1290,6 @@ static bool fork_domain_child(struct winbindd_child *child)
 
 		child->lockout_policy_event = event_add_timed(
 			winbind_event_context(), NULL, timeval_zero(),
-			"account_lockout_policy_handler",
 			account_lockout_policy_handler,
 			child);
 	}
@@ -1308,7 +1304,6 @@ static bool fork_domain_child(struct winbindd_child *child)
 						       &next_change)) {
 			child->machine_password_change_event = event_add_timed(
 				winbind_event_context(), NULL, next_change,
-				"machine_password_change_handler",
 				machine_password_change_handler,
 				child);
 		}