From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 6 Nov 2017 17:53:22 +0000 (-0500)
Subject: one more fr_event_timer fix
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33499ae0ecc1314bbaa679d45e3d29918cf208ae;p=thirdparty%2Ffreeradius-server.git

one more fr_event_timer fix
---

diff --git a/src/lib/io/worker.c b/src/lib/io/worker.c
index 12cf8a1cda8..e8a2b40e324 100644
--- a/src/lib/io/worker.c
+++ b/src/lib/io/worker.c
@@ -667,7 +667,7 @@ static void worker_reset_timer(fr_worker_t *worker)
 	fr_time_to_timeval(&when, cleanup);
 
 	DEBUG2("Resetting worker cleanup timer to +30s");
-	if (fr_event_timer_insert(worker, worker->el, &worker->ev_cleanup,
+	if (fr_event_timer_insert(NULL, worker->el, &worker->ev_cleanup,
 				  &when, fr_worker_max_request_time, worker) < 0) {
 		ERROR("Failed inserting max_request_time timer.");
 	}
@@ -1231,6 +1231,8 @@ void fr_worker_destroy(fr_worker_t *worker)
 	}
 #endif
 
+	if (worker->ev_cleanup) (void) fr_event_timer_delete(worker->el, &worker->ev_cleanup);
+
 	(void) fr_event_pre_delete(worker->el, fr_worker_pre_event, worker);
 	(void) fr_event_post_delete(worker->el, fr_worker_post_event, worker);