From: Martin Willi <martin@revosec.ch>
Date: Wed, 4 Jan 2012 16:50:19 +0000 (+0100)
Subject: Destroy IKE_SA after reauthentication initiatend and lifetime limit reached
X-Git-Tag: 5.0.0~338^2~9^2~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a0b67bce593c99d5ae0dd5e2920c6772843ad7a;p=thirdparty%2Fstrongswan.git

Destroy IKE_SA after reauthentication initiatend and lifetime limit reached
---

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index d659a3c681..1992a60177 100644
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1296,8 +1296,13 @@ METHOD(ike_sa_t, delete_, status_t,
 {
 	switch (this->state)
 	{
-		case IKE_ESTABLISHED:
 		case IKE_REKEYING:
+			if (this->version == IKEV1)
+			{	/* SA has been reauthenticated, delete */
+				break;
+			}
+			/* FALL */
+		case IKE_ESTABLISHED:
 			this->task_manager->queue_ike_delete(this->task_manager);
 			return this->task_manager->initiate(this->task_manager);
 		case IKE_CREATED: