From 92e75e4535ef98b9dd42e322e8126a7bc5a9945e Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Sun, 9 Dec 2012 19:35:23 +0100
Subject: [PATCH] optionally skip dlclose() of IMCs/IMVs in order to track
 memory leaks

---
 src/libcharon/plugins/tnc_imc/tnc_imc.c | 4 +++-
 src/libcharon/plugins/tnc_imv/tnc_imv.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc.c b/src/libcharon/plugins/tnc_imc/tnc_imc.c
index d49f3dd..9ac5784 100644
--- a/src/libcharon/plugins/tnc_imc/tnc_imc.c
+++ b/src/libcharon/plugins/tnc_imc/tnc_imc.c
@@ -21,6 +21,7 @@
 #include <tncif_pa_subtypes.h>
 
 #include <utils/debug.h>
+#include <daemon.h>
 #include <library.h>
 #include <collections/linked_list.h>
 #include <threading/mutex.h>
@@ -302,7 +303,8 @@ METHOD(imc_t, type_supported, bool,
 METHOD(imc_t, destroy, void,
 	private_tnc_imc_t *this)
 {
-	if (this->handle)
+	if (this->handle && lib->settings->get_bool(lib->settings,
+		"%s.plugins.tnc-imc.dlclose", TRUE, charon->name))
 	{
 		dlclose(this->handle);
 	}
diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv.c b/src/libcharon/plugins/tnc_imv/tnc_imv.c
index f7b1276..ef0387d 100644
--- a/src/libcharon/plugins/tnc_imv/tnc_imv.c
+++ b/src/libcharon/plugins/tnc_imv/tnc_imv.c
@@ -21,6 +21,7 @@
 #include <tncif_pa_subtypes.h>
 
 #include <utils/debug.h>
+#include <daemon.h>
 #include <library.h>
 #include <collections/linked_list.h>
 #include <threading/mutex.h>
@@ -298,7 +299,8 @@ METHOD(imv_t, type_supported, bool,
 METHOD(imv_t, destroy, void,
 	private_tnc_imv_t *this)
 {
-	if (this->handle)
+	if (this->handle && lib->settings->get_bool(lib->settings,
+		"%s.plugins.tnc-imv.dlclose", TRUE, charon->name))
 	{
 		dlclose(this->handle);
 	}
-- 
2.7.4