Destroy mediation managers before unloading plugins.

diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c
index 9b6af22bb9657761840f8f81b2ee5a81a0b9a816..b8dc52a602029fa2133815ddac131871805451dd 100644 (file)
--- a/src/libcharon/daemon.c
+++ b/src/libcharon/daemon.c
@@ -111,6 +111,10 @@ static void destroy(private_daemon_t *this)
        }
        DESTROY_IF(this->public.receiver);
        DESTROY_IF(this->public.sender);
+#ifdef ME
+       DESTROY_IF(this->public.connect_manager);
+       DESTROY_IF(this->public.mediation_manager);
+#endif /* ME */
        /* unload plugins to release threads */
        lib->plugins->unload(lib->plugins);
 #ifdef CAPABILITIES_LIBCAP
@@ -122,10 +126,6 @@ static void destroy(private_daemon_t *this)
        DESTROY_IF(this->public.ike_sa_manager);
        DESTROY_IF(this->public.controller);
        DESTROY_IF(this->public.eap);
-#ifdef ME
-       DESTROY_IF(this->public.connect_manager);
-       DESTROY_IF(this->public.mediation_manager);
-#endif /* ME */
        DESTROY_IF(this->public.backends);
        DESTROY_IF(this->public.socket);