aboutsummaryrefslogtreecommitdiffstats
path: root/src/libtnccs/tnc/tnc.c
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2012-11-15 11:51:21 +0100
committerMartin Willi <martin@revosec.ch>2012-11-30 15:48:26 +0100
commitdd685d55e52211678b0b2ca4762f9c7cf49b6b04 (patch)
treea813e42a419611b1511ca9de05d8c470d4fe3254 /src/libtnccs/tnc/tnc.c
parent016d343a50f32b468d559c93bcfa7335c800a072 (diff)
downloadstrongswan-dd685d55e52211678b0b2ca4762f9c7cf49b6b04.tar.bz2
strongswan-dd685d55e52211678b0b2ca4762f9c7cf49b6b04.tar.xz
Don't unload IMC/IMV managers if no IMC/IMVs loaded from tnc_config
Diffstat (limited to 'src/libtnccs/tnc/tnc.c')
-rw-r--r--src/libtnccs/tnc/tnc.c22
1 files changed, 4 insertions, 18 deletions
diff --git a/src/libtnccs/tnc/tnc.c b/src/libtnccs/tnc/tnc.c
index 9dca25a00..769b9fa54 100644
--- a/src/libtnccs/tnc/tnc.c
+++ b/src/libtnccs/tnc/tnc.c
@@ -259,24 +259,10 @@ bool tnc_manager_register(plugin_t *plugin, plugin_feature_t *feature,
if (load_imcvs)
{
- char *tnc_config;
-
- tnc_config = lib->settings->get_str(lib->settings,
- "libtnccs.tnc_config", "/etc/tnc_config");
- if (!load_imcvs_from_config(tnc_config, is_imc))
- {
- if (is_imc)
- {
- tnc->imcs->destroy(tnc->imcs);
- tnc->imcs = NULL;
- }
- else
- {
- tnc->imvs->destroy(tnc->imvs);
- tnc->imvs = NULL;
- }
- return FALSE;
- }
+ load_imcvs_from_config(
+ lib->settings->get_str(lib->settings,
+ "libtnccs.tnc_config", "/etc/tnc_config"),
+ is_imc);
}
}
return TRUE;