Automatically remove xlat's when we free a module instance

FreeRADIUS · Oct 29, 2014 · 7bfae92 · 7bfae92
1 parent 156acba
commit 7bfae92
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/src/main/modules.c b/src/main/modules.c
@@ -392,6 +392,13 @@ static void module_instance_free(void *data)
 
 	xlat_unregister(this->name, NULL, this->insthandle);
 
+	/*
+	 *	Remove all xlat's registered to this instance.
+	 */
+	if (this->insthandle) {
+		xlat_unregister_module(this->insthandle);
+	}
+
 #ifndef NDEBUG
 	memset(this, 0, sizeof(*this));
 #endif

diff --git a/src/modules/proto_dhcp/rlm_dhcp.c b/src/modules/proto_dhcp/rlm_dhcp.c
@@ -117,17 +117,6 @@ static ssize_t dhcp_xlat(UNUSED void *instance, REQUEST *request, char const *fm
 	return fr_bin2hex(out, binbuf, len);
 }
 
-/*
- *	Only free memory we allocated.  The strings allocated via
- *	cf_section_parse() do not need to be freed.
- */
-static int mod_detach(void *instance)
-{
-	xlat_unregister("dhcp_options", dhcp_options_xlat, instance);
-	xlat_unregister("dhcp", dhcp_xlat, instance);
-	return 0;
-}
-
 
 /*
  *	Instantiate the module.
@@ -184,7 +173,7 @@ module_t rlm_dhcp = {
 	sizeof(rlm_dhcp_t),
 	NULL,				/* CONF_PARSER */
 	mod_instantiate,		/* instantiation */
-	mod_detach,			/* detach */
+	NULL,				/* detach */
 	{
 		NULL,			/* authentication */
 		NULL,			/* authorization */

diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
@@ -771,8 +771,6 @@ static int mod_detach(void *instance)
 
 	fr_connection_pool_delete(inst->conn_pool);
 
-	xlat_unregister(inst->xlat_name, rest_xlat, instance);
-
 	/* Free any memory used by libcurl */
 	rest_cleanup();
 

diff --git a/src/modules/rlm_unbound/rlm_unbound.c b/src/modules/rlm_unbound/rlm_unbound.c
@@ -697,9 +697,6 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
 	    xlat_register(inst->xlat_aaaa_name, xlat_aaaa, NULL, inst) ||
 	    xlat_register(inst->xlat_ptr_name, xlat_ptr, NULL, inst)) {
 		ERROR("rlm_unbound (%s): Failed registering xlats", inst->name);
-		xlat_unregister(inst->xlat_a_name, xlat_a, inst);
-		xlat_unregister(inst->xlat_aaaa_name, xlat_aaaa, inst);
-		xlat_unregister(inst->xlat_ptr_name, xlat_ptr, inst);
 		goto error_nores;
 	}
 	return 0;
@@ -717,10 +714,6 @@ static int mod_detach(UNUSED void *instance)
 {
 	rlm_unbound_t *inst = instance;
 
-	xlat_unregister(inst->xlat_a_name, xlat_a, inst);
-	xlat_unregister(inst->xlat_aaaa_name, xlat_aaaa, inst);
-	xlat_unregister(inst->xlat_ptr_name, xlat_ptr, inst);
-
 	if (inst->log_fd >= 0) {
 		fr_event_fd_delete(inst->el, 0, inst->log_fd);
 		if (inst->ub) {