Fix IKEv1 DPD clear, destroying IKE_SA even if reestablish not needed

2012-05-21 12:17:32 +02:00
parent 769696450a
commit b5341bb07c
1 changed files with 3 additions and 9 deletions
@@ -77,15 +77,9 @@ METHOD(job_t, execute, void,
 		if (use_time < this->check)
 		{
 			DBG1(DBG_JOB, "DPD check timed out, enforcing DPD action");
-			if (ike_sa->reestablish(ike_sa) == SUCCESS)
-			{
-				charon->ike_sa_manager->checkin_and_destroy(
-											charon->ike_sa_manager, ike_sa);
-			}
-			else
-			{
-				charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
-			}
+			ike_sa->reestablish(ike_sa);
+			charon->ike_sa_manager->checkin_and_destroy(charon->ike_sa_manager,
+														ike_sa);
 		}
 		else
 		{