Properly select IMC/IMV according to given primary ID in reserve_id()

diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c b/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c
index d2fce6fe68022f397c7ad2b7fb505561978d628a..bdb20d5560965f61f9b4325fbe1877d52588425b 100644 (file)
--- a/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c
+++ b/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c
@@ -193,7 +193,7 @@ METHOD(imc_manager_t, reserve_id, bool,
        enumerator = this->imcs->create_enumerator(this->imcs);
        while (enumerator->enumerate(enumerator, &imc))
        {
-               if (imc->get_id(imc))
+               if (id == imc->get_id(imc))
                {
                        found = TRUE;
                        *new_id = this->next_imc_id++;

diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv_manager.c b/src/libcharon/plugins/tnc_imv/tnc_imv_manager.c
index 308285d07ba218e2d81a4457ebb62ceeebe3d20e..49f51493a604932d3a8954a016a4002fd1aabe9c 100644 (file)
--- a/src/libcharon/plugins/tnc_imv/tnc_imv_manager.c
+++ b/src/libcharon/plugins/tnc_imv/tnc_imv_manager.c
@@ -207,7 +207,7 @@ METHOD(imv_manager_t, reserve_id, bool,
        enumerator = this->imvs->create_enumerator(this->imvs);
        while (enumerator->enumerate(enumerator, &imv))
        {
-               if (imv->get_id(imv))
+               if (id == imv->get_id(imv))
                {
                        found = TRUE;
                        *new_id = this->next_imv_id++;