From 3ae2ed4504c81e197fab5804e9cde7ebeb34d5c2 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Feb 2013 10:17:40 +0100 Subject: s3:winbindd: s/struct timed_event/struct tevent_timer Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam --- source3/winbindd/winbindd.h | 8 ++++---- source3/winbindd/winbindd_cm.c | 2 +- source3/winbindd/winbindd_cred_cache.c | 8 ++++---- source3/winbindd/winbindd_dual.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h index c01cac7ab3..5a8aed1930 100644 --- a/source3/winbindd/winbindd.h +++ b/source3/winbindd/winbindd.h @@ -137,8 +137,8 @@ struct winbindd_child { struct tevent_queue *queue; struct dcerpc_binding_handle *binding_handle; - struct timed_event *lockout_policy_event; - struct timed_event *machine_password_change_event; + struct tevent_timer *lockout_policy_event; + struct tevent_timer *machine_password_change_event; const struct winbindd_child_dispatch_table *table; }; @@ -213,7 +213,7 @@ struct winbindd_domain { /* Callback we use to try put us back online. */ uint32 check_online_timeout; - struct timed_event *check_online_event; + struct tevent_timer *check_online_event; /* Linked list info */ @@ -386,7 +386,7 @@ struct WINBINDD_CCACHE_ENTRY { time_t create_time; time_t renew_until; time_t refresh_time; - struct timed_event *event; + struct tevent_timer *event; }; #include "winbindd/winbindd_proto.h" diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 25bb0345dc..b2f8cc481a 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -287,7 +287,7 @@ static bool fork_child_dc_connect(struct winbindd_domain *domain) ****************************************************************/ static void check_domain_online_handler(struct tevent_context *ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now, void *private_data) { diff --git a/source3/winbindd/winbindd_cred_cache.c b/source3/winbindd/winbindd_cred_cache.c index ac5b329d85..293a821a23 100644 --- a/source3/winbindd/winbindd_cred_cache.c +++ b/source3/winbindd/winbindd_cred_cache.c @@ -39,7 +39,7 @@ static struct WINBINDD_CCACHE_ENTRY *ccache_list; static void krb5_ticket_gain_handler(struct tevent_context *, - struct timed_event *, + struct tevent_timer *, struct timeval, void *); static void add_krb5_ticket_gain_handler_event(struct WINBINDD_CCACHE_ENTRY *, @@ -105,7 +105,7 @@ void ccache_remove_all_after_fork(void) ****************************************************************/ static void krb5_ticket_refresh_handler(struct tevent_context *event_ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now, void *private_data) { @@ -298,7 +298,7 @@ done: ****************************************************************/ static void krb5_ticket_gain_handler(struct tevent_context *event_ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now, void *private_data) { @@ -417,7 +417,7 @@ void ccache_regain_all_now(void) struct timeval t = timeval_current(); for (cur = ccache_list; cur; cur = cur->next) { - struct timed_event *new_event; + struct tevent_timer *new_event; /* * if refresh_time is 0, we know that the diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c index 29bb1f8940..b4ef0bd79e 100644 --- a/source3/winbindd/winbindd_dual.c +++ b/source3/winbindd/winbindd_dual.c @@ -860,7 +860,7 @@ void winbind_msg_dump_domain_list(struct messaging_context *msg_ctx, } static void account_lockout_policy_handler(struct tevent_context *ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now, void *private_data) { @@ -977,7 +977,7 @@ static bool calculate_next_machine_pwd_change(const char *domain, } static void machine_password_change_handler(struct tevent_context *ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now, void *private_data) { -- cgit