From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 30 Mar 2018 19:37:38 +0000 (+0100)
Subject: Disable dict autoloading so we can work with the single dictionary until everything... 
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65db04a4a11e2be01b1bb3075f24d3ac86c6f8bc;p=thirdparty%2Ffreeradius-server.git

Disable dict autoloading so we can work with the single dictionary until everything has been converted
---

diff --git a/src/main/module.c b/src/main/module.c
index 07f39e3cc7b..62f7cc6ecf7 100644
--- a/src/main/module.c
+++ b/src/main/module.c
@@ -968,6 +968,7 @@ static int virtual_module_bootstrap(CONF_SECTION *modules, CONF_SECTION *vm_cs)
  *	- 0 on success.
  *	- -1 on failure.
  */
+#if 0
 static int _module_dict_autoload(dl_t const *module, void *symbol, UNUSED void *user_ctx)
 {
 	fr_dict_autoload_t const *p = *((fr_dict_autoload_t **)symbol);
@@ -996,6 +997,7 @@ static void _module_dict_autofree(UNUSED dl_t const *module, void *symbol, UNUSE
 
 	while ((p++)->proto) fr_dict_autofree(p);
 }
+#endif
 
 /** Callback to automatically resolve attributes and check the types are correct
  *
@@ -1040,9 +1042,9 @@ int modules_bootstrap(CONF_SECTION *root)
 	/*
 	 *	Register dictionary autoload callbacks
 	 */
-	dl_symbol_init_cb_register("dict", _module_dict_autoload, NULL);
+//	dl_symbol_init_cb_register("dict", _module_dict_autoload, NULL);
 	dl_symbol_init_cb_unregister("dict_attr", _module_dict_attr_autoload);
-	dl_symbol_free_cb_register("dict", _module_dict_autofree, NULL);
+//	dl_symbol_free_cb_register("dict", _module_dict_autofree, NULL);
 
 	/*
 	 *	Remember where the modules were stored.