From 39f93e00ca8a3bb4aae589ba0a99a192fbdd5113 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Wed, 12 Nov 2014 12:42:38 +0100
Subject: [PATCH] Revert "Make phase1_status function wok whnever there is a
 smp dump. This should unbreak Ticket #3955"

This reverts commit 694d368d818508a40bdef4f1a3f64b414b11c442.
---
 etc/inc/ipsec.inc | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/etc/inc/ipsec.inc b/etc/inc/ipsec.inc
index 874cbfd7c..601f17da9 100644
--- a/etc/inc/ipsec.inc
+++ b/etc/inc/ipsec.inc
@@ -346,15 +346,8 @@ function ipsec_lookup_phase1(& $ph2ent,& $ph1ent) {
  */
 function ipsec_phase1_status($ipsec_status, $ikeid) {
 
-	if (!is_array($ipsec_status['query']))
-		return false;
-	if (!is_array($ipsec_status['query']['ikesalist']))
-		return false;
-	if (!is_array($ipsec_status['query']['ikesalist']['ikesa']))
-		return false;
-
-	foreach ($ipsec_status['query']['ikesalist']['ikesa'] as $ike) {
-		if ($ike['id'] != "con{$ikeid}")
+	foreach ($ipsec_status as $ike) {
+		if ($ike['id'] != $ikeid)
 			continue;
 		if ($ike['status'] == 'established')
 			return true;