Fix errors in previous commit

diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c
index 3910956961e4480fb803fdceb38e9f3befa20ecf..38ce86790fc7ac867a4256f6c2b6cd9a6400200e 100644 (file)
--- a/src/bin/radiusd.c
+++ b/src/bin/radiusd.c
@@ -700,7 +700,7 @@ int main(int argc, char *argv[])
        /*
         *      Initialise the interpreter, registering operations.
         */
-       if (unlang_init() < 0) return -1;
+       if (unlang_init_global() < 0) return -1;
 
        if (server_init(config->root_cs) < 0) EXIT_WITH_FAILURE;
 
@@ -987,7 +987,7 @@ cleanup:
        /*
         *      Free any resources used by the unlang interpreter.
         */
-       unlang_free();
+       unlang_free_global();
 
 #ifdef HAVE_OPENSSL_CRYPTO_H
        fr_openssl_free();              /* Cleanup any memory alloced by OpenSSL and placed into globals */

diff --git a/src/lib/unlang/base.c b/src/lib/unlang/base.c
index fbcead89e2b266a5681fe2916c33bac3174bf832..2dcbb442ca279fe0ef28637ac9fba53bb277f49d 100644 (file)
--- a/src/lib/unlang/base.c
+++ b/src/lib/unlang/base.c
@@ -79,7 +79,6 @@ int unlang_init_global(void)
         */
        if (xlat_init() < 0) return -1;
 
-       unlang_interpret_init_global();
        /* Register operations for the default keywords */
        unlang_condition_init();
        unlang_foreach_init();
@@ -99,7 +98,7 @@ int unlang_init_global(void)
        return 0;
 }
 
-void unlang_free(void)
+void unlang_free_global(void)
 {
        if (--instance_count > 0) return;
 

diff --git a/src/lib/unlang/base.h b/src/lib/unlang/base.h
index d27180fad5dda4f25331732f2db11d10384f46e5..9d128872b81f2c9ae44c1d797ba5ef613b7e8ecc 100644 (file)
--- a/src/lib/unlang/base.h
+++ b/src/lib/unlang/base.h
@@ -37,7 +37,7 @@ bool                  unlang_section(CONF_SECTION *cs);
 
 int                    unlang_init_global(void);
 
-int                    unlang_free_global(void);
+void                   unlang_free_global(void);
 
 
 #ifdef __cplusplus