From: Martin Willi <martin@revosec.ch>
Date: Thu, 22 Dec 2011 12:26:38 +0000 (+0100)
Subject: Double check that we could select a TS as quick mode responder
X-Git-Tag: 5.0.0~338^2~9^2~114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f1df0a060e25f189f8856331d6bf3ce4ac83b73;p=thirdparty%2Fstrongswan.git

Double check that we could select a TS as quick mode responder
---

diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index 94e5bb85a3..017ce97d4b 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -699,10 +699,10 @@ METHOD(task_t, process_r, status_t,
 			}
 			tsi->destroy_offset(tsi, offsetof(traffic_selector_t, destroy));
 			tsr->destroy_offset(tsr, offsetof(traffic_selector_t, destroy));
-			if (!this->config)
+			if (!this->config || !this->tsi || !this->tsr)
 			{
-				DBG1(DBG_IKE, "no child config found");
-				return send_notify(this, NO_PROPOSAL_CHOSEN);
+				DBG1(DBG_IKE, "no matching CHILD_SA config found");
+				return send_notify(this, INVALID_ID_INFORMATION);
 			}
 
 			sa_payload = (sa_payload_t*)message->get_payload(message,