Don't create interim update entries if RADIUS accounting is disabled

diff --git a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
index dfec0bdda1def0ef7c14224818fd01ad1605398a..3620a405201e91cf3f2bc98989394dff05444679 100644 (file)
--- a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
@@ -648,6 +648,7 @@ METHOD(listener_t, child_updown, bool,
 METHOD(eap_radius_accounting_t, destroy, void,
        private_eap_radius_accounting_t *this)
 {
+       charon->bus->remove_listener(charon->bus, &this->public.listener);
        singleton = NULL;
        this->mutex->destroy(this->mutex);
        this->sessions->destroy(this->sessions);
@@ -680,7 +681,12 @@ eap_radius_accounting_t *eap_radius_accounting_create()
                .mutex = mutex_create(MUTEX_TYPE_DEFAULT),
        );
 
-       singleton = this;
+       if (lib->settings->get_bool(lib->settings,
+                                       "%s.plugins.eap-radius.accounting", FALSE, charon->name))
+       {
+               singleton = this;
+               charon->bus->add_listener(charon->bus, &this->public.listener);
+       }
        return &this->public;
 }
 

diff --git a/src/libcharon/plugins/eap_radius/eap_radius_plugin.c b/src/libcharon/plugins/eap_radius/eap_radius_plugin.c
index c32f52183a959ad6d0d49336545f604b4514c7ab..3baf4673159943343a66071e3c708442b4916814 100644 (file)
--- a/src/libcharon/plugins/eap_radius/eap_radius_plugin.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius_plugin.c
@@ -227,7 +227,6 @@ METHOD(plugin_t, destroy, void,
        this->configs->destroy_offset(this->configs,
                                                                  offsetof(radius_config_t, destroy));
        this->lock->destroy(this->lock);
-       charon->bus->remove_listener(charon->bus, &this->accounting->listener);
        this->accounting->destroy(this->accounting);
        free(this);
        instance = NULL;
@@ -259,11 +258,6 @@ plugin_t *eap_radius_plugin_create()
        load_configs(this);
        instance = this;
 
-       if (lib->settings->get_bool(lib->settings,
-                                       "%s.plugins.eap-radius.accounting", FALSE, charon->name))
-       {
-               charon->bus->add_listener(charon->bus, &this->accounting->listener);
-       }
        if (lib->settings->get_bool(lib->settings,
                                        "%s.plugins.eap-radius.dae.enable", FALSE, charon->name))
        {