From 406c5a593bc29613420b97a660103b405808204d Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 14 Dec 2011 14:24:15 +0100
Subject: [PATCH] Destroy mediation managers before unloading plugins.

---
 src/libcharon/daemon.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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