From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 11 Mar 2015 14:48:51 +0000 (+0100)
Subject: ikev1: Mark rekeyed CHILD_SAs as INSTALLED
X-Git-Tag: 5.3.0rc1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c6a62ceb6;p=thirdparty%2Fstrongswan.git

ikev1: Mark rekeyed CHILD_SAs as INSTALLED

Since we keep them around until they finally expire they otherwise would block
IKE_SA rekeying/reauthentication.
---

diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index 828b166d0a..4b5b0160a1 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -401,6 +401,8 @@ static bool install(private_quick_mode_t *this)
 	if (old)
 	{
 		charon->bus->child_rekey(charon->bus, old, this->child_sa);
+		/* rekeyed CHILD_SAs stay installed until they expire */
+		old->set_state(old, CHILD_INSTALLED);
 	}
 	else
 	{