aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2011-12-14 14:24:15 +0100
committerTobias Brunner <tobias@strongswan.org>2011-12-14 14:24:37 +0100
commit406c5a593bc29613420b97a660103b405808204d (patch)
tree1f2cc293845fd2cc591c418326d93403812373f6 /src
parent19e9bdda1f6872d27160e54cc65794c79cc472b4 (diff)
downloadstrongswan-406c5a593bc29613420b97a660103b405808204d.tar.bz2
strongswan-406c5a593bc29613420b97a660103b405808204d.tar.xz
Destroy mediation managers before unloading plugins.
Diffstat (limited to 'src')
-rw-r--r--src/libcharon/daemon.c8
1 files 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);