From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 26 Sep 2019 21:45:14 +0000 (-0400)
Subject: the delay module can have xlat OR module timeouts
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b8410b03e71d000f6ceef5b0258e958faf03e09;p=thirdparty%2Ffreeradius-server.git

the delay module can have xlat OR module timeouts
---

diff --git a/src/modules/rlm_delay/rlm_delay.c b/src/modules/rlm_delay/rlm_delay.c
index 7ef54d62f34..e6086dde690 100644
--- a/src/modules/rlm_delay/rlm_delay.c
+++ b/src/modules/rlm_delay/rlm_delay.c
@@ -143,7 +143,13 @@ static void mod_delay_cancel(UNUSED void *instance, UNUSED void *thread, REQUEST
 
 	RDEBUG2("Cancelling delay");
 
-	if (!fr_cond_assert(unlang_xlat_event_timeout_delete(request, rctx) == 0)) return;
+	/*
+	 *	One or the other, or both will be set.  But we don't
+	 *	know which ones.  So just delete both of them.
+	 */
+	(void) unlang_module_timeout_delete(request, rctx);
+
+	(void) unlang_xlat_event_timeout_delete(request, rctx);
 }
 
 static rlm_rcode_t CC_HINT(nonnull) mod_delay(void *instance, UNUSED void *thread, REQUEST *request)