From: Martin Willi <martin@revosec.ch>
Date: Thu, 15 Dec 2011 17:11:00 +0000 (+0100)
Subject: Consider notify errors fatal only during main mode
X-Git-Tag: 5.0.0~338^2~9^2~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fceb20f390789554e537ff606416cac2b4991ae6;p=thirdparty%2Fstrongswan.git

Consider notify errors fatal only during main mode
---

diff --git a/src/libcharon/sa/tasks/informational.c b/src/libcharon/sa/tasks/informational.c
index 60e1cfcb84..5b2ceca845 100644
--- a/src/libcharon/sa/tasks/informational.c
+++ b/src/libcharon/sa/tasks/informational.c
@@ -84,7 +84,10 @@ METHOD(task_t, process_r, status_t,
 				{
 					DBG1(DBG_IKE, "received %N error notify",
 						 notify_type_names, notify->get_notify_type(notify));
-					status = FAILED;
+					if (this->ike_sa->get_state(this->ike_sa) == IKE_CONNECTING)
+					{	/* only critical during main mode */
+						status = FAILED;
+					}
 					break;
 				}
 				else