From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 3 Jun 2020 23:14:06 +0000 (-0400)
Subject: move trigger_exec_free() to server_free()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa58df2cbc6ca58f3470030c1171209d47ebd142;p=thirdparty%2Ffreeradius-server.git

move trigger_exec_free() to server_free()

because it's set up in server_init()
---

diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c
index 69bdba87808..19aef1f12b2 100644
--- a/src/bin/radiusd.c
+++ b/src/bin/radiusd.c
@@ -1050,12 +1050,6 @@ cleanup:
 	 */
 	talloc_free(global_ctx);
 
-	/*
-	 *  Now we're sure no more triggers can fire, free the
-	 *  trigger tree
-	 */
-	trigger_exec_free();
-
 	/*
 	 *  Anything not cleaned up by the above is allocated in
 	 *  the NULL top level context, and is likely leaked memory.
diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index c87efcf6c56..c459c391756 100644
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -1027,12 +1027,6 @@ cleanup:
 
 	if (dl_modules) talloc_free(dl_modules);
 
-	/*
-	 *  Now we're sure no more triggers can fire, free the
-	 *  trigger tree
-	 */
-	trigger_exec_free();
-
 	if (receipt_file && (ret == EXIT_SUCCESS) && (fr_touch(NULL, receipt_file, 0644, true, 0755) <= 0)) {
 		fr_perror("unit_test_module");
 		ret = EXIT_FAILURE;
diff --git a/src/lib/server/base.c b/src/lib/server/base.c
index eaf48c67f34..03b3fcca83d 100644
--- a/src/lib/server/base.c
+++ b/src/lib/server/base.c
@@ -126,4 +126,11 @@ void server_free(void)
 	 *	Free information associated with the virtual servers.
 	 */
 	virtual_servers_free();
+
+	/*
+	 *	Now we're sure no more triggers can fire, free the
+	 * 	trigger tree.
+	 */
+	trigger_exec_free();
+
 }