From 1e92a236f4e61a4fef97d35ba0107a54c06ac65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20LU=C3=87I?= <eri@pfsense.org>
Date: Thu, 30 Apr 2015 22:50:12 +0200
Subject: [PATCH] Revert "Use a dirty hack to make IKEv1 with multiple phase2
 to work correctly with one IKE SA for each subnet"

This reverts commit 7d5add01e48bab8d82d5a5699325fa7b6aeb4e5c.
---
 etc/inc/vpn.inc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index c4b86703a0..3e60e1a1b6 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -1074,14 +1074,11 @@ EOD;
 			if (!isset($ph1ent['mobile']) && $keyexchange == 'ikev1') {
 				if (!empty($rightsubnet_spec)) {
 					$ipsecfin = '';
-					$keyingtries = 3;
 					foreach ($rightsubnet_spec as $idx => $rsubnet) {
 						$ipsecfin .= "\nconn con{$ph1ent['ikeid']}00{$idx}\n";
 						if (!empty($reqids[$idx]))
 							$ipsecfin .= "\treqid = " . $reqids[$idx] . "\n";
 						$ipsecfin .= $ipsecconnect;
-						$ipsecfin .= "\tkeyingtries = {$keyingtries}\n";
-						$keyingtries++;
 						$ipsecfin .= "\trightsubnet = {$rsubnet}\n";
 						$ipsecfin .= "\tleftsubnet = " . $leftsubnet_spec[$idx] . "\n";
 					}