From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 20 Apr 2016 12:14:05 +0000 (+0200)
Subject: ikev1: Don't call updown hook etc. when deleting redundant CHILD_SAs
X-Git-Tag: 5.4.1dr2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a01eb5e4da150c7573515d630f9fd7f1dfdb4d05;p=thirdparty%2Fstrongswan.git

ikev1: Don't call updown hook etc. when deleting redundant CHILD_SAs

Fixes #1421.
---

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index f0c456e58b..7aa2c646b5 100644
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -1754,6 +1754,7 @@ METHOD(task_manager_t, queue_child_rekey, void,
 	{
 		if (is_redundant(this, child_sa))
 		{
+			child_sa->set_state(child_sa, CHILD_REKEYED);
 			queue_task(this, (task_t*)quick_delete_create(this->ike_sa,
 												protocol, spi, FALSE, FALSE));
 		}