From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 18 Jul 2013 08:12:20 +0000 (+0200)
Subject: ike: Fix reestablishing SAs if no child-creating tasks are queued
X-Git-Tag: 5.1.0rc1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07a9d5c91a3bd88fbfe5a36a807655bebfef42ae;p=thirdparty%2Fstrongswan.git

ike: Fix reestablishing SAs if no child-creating tasks are queued
---

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 508612034c..2f4e1123c2 100644
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1617,8 +1617,11 @@ METHOD(ike_sa_t, reestablish, status_t,
 		}
 		enumerator->destroy(enumerator);
 		/* check if we have tasks that recreate children */
-		restart = is_child_queued(this, TASK_QUEUE_ACTIVE) ||
-				  is_child_queued(this, TASK_QUEUE_QUEUED);
+		if (!restart)
+		{
+			restart = is_child_queued(this, TASK_QUEUE_ACTIVE) ||
+					  is_child_queued(this, TASK_QUEUE_QUEUED);
+		}
 #ifdef ME
 		/* mediation connections have no children, keep them up anyway */
 		if (this->peer_cfg->is_mediation(this->peer_cfg))