From dd685d55e52211678b0b2ca4762f9c7cf49b6b04 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 15 Nov 2012 11:51:21 +0100 Subject: [PATCH] Don't unload IMC/IMV managers if no IMC/IMVs loaded from tnc_config --- src/libtnccs/tnc/tnc.c | 22 ++++------------------ 1 file 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;