From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Thu, 4 Dec 2008 23:16:10 +0000 (-0000)
Subject: extended changeset [4753]
X-Git-Tag: 4.2.10~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c333bb46785698b3be17745eab75e050301e1e2c;p=thirdparty%2Fstrongswan.git

extended changeset [4753]
---

diff --git a/src/charon/config/backend_manager.c b/src/charon/config/backend_manager.c
index e9d75ac0b9..c31df8d04a 100644
--- a/src/charon/config/backend_manager.c
+++ b/src/charon/config/backend_manager.c
@@ -252,7 +252,8 @@ static peer_cfg_t *get_peer_cfg(private_backend_manager_t *this, host_t *me,
 			DBG2(DBG_CFG, "  candidate \"%s\": %D...%D with prio %d.%d",
 			 	 current->get_name(current), my_cand, other_cand,
 			 	 match_peer, match_ike);
-			if (match_peer > best_peer && match_ike >= best_ike)
+			if ((match_peer > best_peer && match_ike >= best_ike) ||
+				(match_peer >= best_peer && match_ike > best_ike))
 			{
 				DESTROY_IF(found);
 				found = current;