]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
Don't unload IMC/IMV managers if no IMC/IMVs loaded from tnc_config
authorMartin Willi <martin@revosec.ch>
Thu, 15 Nov 2012 10:51:21 +0000 (11:51 +0100)
committerMartin Willi <martin@revosec.ch>
Fri, 30 Nov 2012 14:48:26 +0000 (15:48 +0100)
src/libtnccs/tnc/tnc.c

index 9dca25a0021c856c3c4dc2aabce13b6d64863316..769b9fa54f3ed91f3f76dc281175e4a9bd886e7b 100644 (file)
@@ -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;