fixing checkout of IKE SAs with only the initiator SPI

diff --git a/src/charon/sa/ike_sa_manager.c b/src/charon/sa/ike_sa_manager.c
index ef2a91d88fc4390e389568eccda78997f063f8bc..66a15501f2634bd183bec2bdc379907704f7f2f4 100644 (file)
--- a/src/charon/sa/ike_sa_manager.c
+++ b/src/charon/sa/ike_sa_manager.c
@@ -174,7 +174,8 @@ static bool entry_match_by_id(entry_t *entry, ike_sa_id_t *id)
        {
                return TRUE;
        }       
-       if (entry->ike_sa_id->get_responder_spi(entry->ike_sa_id) == 0 &&
+       if ((id->get_responder_spi(id) == 0 ||
+                entry->ike_sa_id->get_responder_spi(entry->ike_sa_id) == 0) &&
                id->is_initiator(id) == entry->ike_sa_id->is_initiator(entry->ike_sa_id) &&
                id->get_initiator_spi(id) == entry->ike_sa_id->get_initiator_spi(entry->ike_sa_id))
        {