From 4d7568404c276ea8fd10583e8d769f5ba82587aa Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Thu, 23 Jul 2015 14:43:41 -0500
Subject: Remove "auto", it's just a synonym for IKEv2. Ticket #4873

Conflicts:
	usr/local/www/vpn_ipsec_phase1.php
---
 etc/inc/vpn.inc                    | 4 +---
 usr/local/www/vpn_ipsec_phase1.php | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index b72f6a1..3e7fd67 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -762,9 +762,7 @@ EOD;
 				if ($ph1ent['iketype'] == "ikev2") {
 					$keyexchange = "ikev2";
 					//$passive = "start";
-				} else if ($ph1ent['iketype'] == "auto") {
-					$keyexchange = "ike";
-				}
+				} 
 			}
 
 			if (isset($ph1ent['mobile'])) {
diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php
index 2c9006c..b9079e1 100644
--- a/usr/local/www/vpn_ipsec_phase1.php
+++ b/usr/local/www/vpn_ipsec_phase1.php
@@ -377,8 +377,8 @@ if ($_POST) {
 		}
 	}
 
-	if (!empty($pconfig['iketype']) && $pconfig['iketype'] != "ikev1" && $pconfig['iketype'] != "ikev2" && $pconfig['iketype'] != "auto") {
-		$input_errors[] = gettext("Valid arguments for IKE type is v1 or v2 or auto");
+	if (!empty($pconfig['iketype']) && $pconfig['iketype'] != "ikev1" && $pconfig['iketype'] != "ikev2") {
+		$input_errors[] = gettext("Valid arguments for IKE type is v1 or v2");
 	}
 
 	if (!empty($_POST['ealgo']) && isset($config['system']['crypto_hardware'])) {
@@ -685,7 +685,7 @@ function dpdchkbox_change() {
 						<td width="78%" class="vtable">
 							<select name="iketype" class="formselect" onchange='iketype_change()'>
 							<?php
-								$keyexchange = array("ikev1" => "V1", "ikev2" => "V2", "auto" => "Auto");
+								$keyexchange = array("ikev1" => "V1", "ikev2" => "V2");
 								foreach ($keyexchange as $kidx => $name):
 							?>
 								<option value="<?=$kidx;?>" <?php if ($kidx == $pconfig['iketype']) echo "selected=\"selected\""; ?>>
-- 
cgit v1.1