aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2008-12-04 23:16:10 +0000
committerAndreas Steffen <andreas.steffen@strongswan.org>2008-12-04 23:16:10 +0000
commitc333bb46785698b3be17745eab75e050301e1e2c (patch)
tree7b1f2a6a2126ce38189402930b5243e6da0bf2f4
parent3fb404d8da1e964f4edb5e2e555b11df1f54a2a1 (diff)
downloadstrongswan-c333bb46785698b3be17745eab75e050301e1e2c.tar.bz2
strongswan-c333bb46785698b3be17745eab75e050301e1e2c.tar.xz
extended changeset [4753]
-rw-r--r--src/charon/config/backend_manager.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/charon/config/backend_manager.c b/src/charon/config/backend_manager.c
index e9d75ac0b..c31df8d04 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;