From: Martin Willi <martin@revosec.ch>
Date: Thu, 3 Feb 2011 09:03:36 +0000 (+0100)
Subject: Filter out non-matching ike_cfg in backend manager, so backends don't have to
X-Git-Tag: 4.5.1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4536e669a8f56a69399f6c375aba5ebe8eea376f;p=thirdparty%2Fstrongswan.git

Filter out non-matching ike_cfg in backend manager, so backends don't have to
---

diff --git a/src/libcharon/config/backend_manager.c b/src/libcharon/config/backend_manager.c
index 7b69eda1ce..e78cb702d3 100644
--- a/src/libcharon/config/backend_manager.c
+++ b/src/libcharon/config/backend_manager.c
@@ -96,6 +96,11 @@ static ike_cfg_match_t get_ike_match(ike_cfg_t *cand, host_t *me, host_t *other)
 		{
 			match += MATCH_ANY;
 		}
+		else
+		{
+			me_cand->destroy(me_cand);
+			return MATCH_NONE;
+		}
 		me_cand->destroy(me_cand);
 	}
 	else
@@ -119,6 +124,11 @@ static ike_cfg_match_t get_ike_match(ike_cfg_t *cand, host_t *me, host_t *other)
 		{
 			match += MATCH_ANY;
 		}
+		else
+		{
+			other_cand->destroy(other_cand);
+			return MATCH_NONE;
+		}
 		other_cand->destroy(other_cand);
 	}
 	else