aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/sa/ike_sa_manager.c
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2012-01-20 13:42:37 +0100
committerMartin Willi <martin@revosec.ch>2012-03-20 17:31:38 +0100
commitaa3b53e7165da9d03ccc23a0f0feeeeda6e76219 (patch)
tree6923ae31dc0a796edff3075daaf5458e870c3d27 /src/libcharon/sa/ike_sa_manager.c
parentfed5c33440d609721cfdd5992f269c52a6191539 (diff)
downloadstrongswan-aa3b53e7165da9d03ccc23a0f0feeeeda6e76219.tar.bz2
strongswan-aa3b53e7165da9d03ccc23a0f0feeeeda6e76219.tar.xz
Adopt children after syncing a rekeyed IKEv1 SA
Diffstat (limited to 'src/libcharon/sa/ike_sa_manager.c')
-rw-r--r--src/libcharon/sa/ike_sa_manager.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
index b617a1332..455d5386a 100644
--- a/src/libcharon/sa/ike_sa_manager.c
+++ b/src/libcharon/sa/ike_sa_manager.c
@@ -1375,7 +1375,8 @@ METHOD(ike_sa_manager_t, checkin, void,
}
/* apply identities for duplicate test */
- if (ike_sa->get_state(ike_sa) == IKE_ESTABLISHED &&
+ if ((ike_sa->get_state(ike_sa) == IKE_ESTABLISHED ||
+ ike_sa->get_state(ike_sa) == IKE_PASSIVE) &&
entry->my_id == NULL && entry->other_id == NULL)
{
if (ike_sa->get_version(ike_sa) == IKEV1)