summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-07-23 14:43:41 -0500
committerChris Buechler <cmb@pfsense.org>2015-07-23 14:43:41 -0500
commit47f802694a1e1dfbbd011d7ec431c0948358b5c3 (patch)
treedd96eb300793bc3d6571e7fe93ebbdf5e231b1a9
parentc03512f5b2e4f043fa50eb4ff080d4c475390afd (diff)
downloadpfsense-47f802694a1e1dfbbd011d7ec431c0948358b5c3.zip
pfsense-47f802694a1e1dfbbd011d7ec431c0948358b5c3.tar.gz
Remove "auto", it's just a synonym for IKEv2. Ticket #4873
-rw-r--r--etc/inc/vpn.inc4
-rw-r--r--usr/local/www/vpn_ipsec_phase1.php6
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 5c7aec2..1b87df4 100644
--- a/usr/local/www/vpn_ipsec_phase1.php
+++ b/usr/local/www/vpn_ipsec_phase1.php
@@ -332,8 +332,8 @@ if ($_POST) {
$input_errors[] = gettext("A numeric value must be specified for DPD retries.");
}
- 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'])) {
if ($config['system']['crypto_hardware'] == "glxsb") {
@@ -622,7 +622,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\""; ?>>
OpenPOWER on IntegriCloud