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 69bdba87808e34409e504447c6887c861c00eec4..19aef1f12b203bec6e8668a9838ed27c9eb01637 100644 (file)
--- 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 c87efcf6c56e5b3aa44de323efdb958f6da66a0a..c459c391756f1645f68cd48e8f6506134b3b0c4a 100644 (file)
--- 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 eaf48c67f3435440635d9f789e392fb6b50e041d..03b3fcca83dcc70884f194d2e16c3fd75c5a5738 100644 (file)
--- 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();
+
 }