From: Apple <opensource@apple.com>
Date: Tue, 12 Aug 2014 18:11:44 +0000 (+0000)
Subject: ipsec-258.100.1.tar.gz
X-Git-Tag: os-x-1093^0
X-Git-Url: https://git.saurik.com/apple/ipsec.git/commitdiff_plain/64c59980f82beb1accdfb0d8567e51b97b9c7857

ipsec-258.100.1.tar.gz
---

diff --git a/ipsec-tools/racoon/ike_session.c b/ipsec-tools/racoon/ike_session.c
index a71aff8..c1e7718 100644
--- a/ipsec-tools/racoon/ike_session.c
+++ b/ipsec-tools/racoon/ike_session.c
@@ -1824,7 +1824,7 @@ ike_session_drop_rekey (ike_session_t *session, ike_session_rekey_type_t rekey_t
 			}
 		} else if (!session->is_btmm_ipsec) {
 			if (rekey_type == IKE_SESSION_REKEY_TYPE_PH1 &&
-				!ike_session_has_negoing_ph2(session)) {
+				!ike_session_has_negoing_ph2(session) && !ike_session_has_established_ph2(session)) {
 				// for vpn: only drop ph1 if there are no more ph2s.
 				plog(ASL_LEVEL_DEBUG, "vpn session is idle: drop ph1 rekey.\n");
 				return 1;