check if optional terminate() function exists

diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c b/src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c
index 1feedf9..21cca66 100644 (file)
--- a/src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c
+++ b/src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c
@@ -25,7 +25,8 @@ METHOD(plugin_t, destroy, void,
 
        while (charon->imcs->remove_last(charon->imcs, (void**)&imc) == SUCCESS)
        {
 
        while (charon->imcs->remove_last(charon->imcs, (void**)&imc) == SUCCESS)
        {

-               if (imc->terminate(imc->get_id(imc)) != TNC_RESULT_SUCCESS)
+               if (imc->terminate &&
+                       imc->terminate(imc->get_id(imc)) != TNC_RESULT_SUCCESS)

                {
                        DBG1(DBG_TNC, "IMC '%s' not terminated successfully",
                                                   imc->get_name(imc));
                {
                        DBG1(DBG_TNC, "IMC '%s' not terminated successfully",
                                                   imc->get_name(imc));

diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv_plugin.c b/src/libcharon/plugins/tnc_imv/tnc_imv_plugin.c
index 34f5b76..99e4dce 100644 (file)
--- a/src/libcharon/plugins/tnc_imv/tnc_imv_plugin.c
+++ b/src/libcharon/plugins/tnc_imv/tnc_imv_plugin.c
@@ -25,7 +25,8 @@ METHOD(plugin_t, destroy, void,
 
        while (charon->imvs->remove_last(charon->imvs, (void**)&imv) == SUCCESS)
        {
 
        while (charon->imvs->remove_last(charon->imvs, (void**)&imv) == SUCCESS)
        {

-               if (imv->terminate(imv->get_id(imv)) != TNC_RESULT_SUCCESS)
+               if (imv->terminate &&
+                       imv->terminate(imv->get_id(imv)) != TNC_RESULT_SUCCESS)

                {
                        DBG1(DBG_TNC, "IMV '%s' not terminated successfully",
                                                   imv->get_name(imv));
                {
                        DBG1(DBG_TNC, "IMV '%s' not terminated successfully",
                                                   imv->get_name(imv));