From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 2 Mar 2017 07:58:07 +0000 (+0100)
Subject: controller: Don't listen for CHILD_SA state changes when terminating IKE_SAs
X-Git-Tag: 5.5.2dr6~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df9e512523ec32222c4ed0dbb6a11d03f46a6fcd;p=thirdparty%2Fstrongswan.git

controller: Don't listen for CHILD_SA state changes when terminating IKE_SAs

We actually want to wait until the IKE_SA is destroyed, not any of the
CHILD_SAs (even though there might not be that much of a difference
depending on the number of CHILD_SAs).

Fixes #2261.
---

diff --git a/src/libcharon/control/controller.c b/src/libcharon/control/controller.c
index 93ff70bf36..8e7816b396 100644
--- a/src/libcharon/control/controller.c
+++ b/src/libcharon/control/controller.c
@@ -588,7 +588,6 @@ METHOD(controller_t, terminate_ike, status_t,
 		.listener = {
 			.public = {
 				.ike_state_change = _ike_state_change_terminate,
-				.child_state_change = _child_state_change_terminate,
 			},
 			.logger = {
 				.public = {