From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 14 Dec 2011 13:24:15 +0000 (+0100)
Subject: Destroy mediation managers before unloading plugins.
X-Git-Tag: 4.6.2~114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=406c5a593bc29613420b97a660103b405808204d;p=thirdparty%2Fstrongswan.git

Destroy mediation managers before unloading plugins.
---

diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c
index 9b6af22bb9..b8dc52a602 100644
--- 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);