From 70fc7a158f54da084028cbdd04abde236518bb56 Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Tue, 29 Sep 2015 19:48:33 -0500
Subject: Fix up IKE auto mode

---
 usr/local/www/vpn_ipsec.php        | 2 +-
 usr/local/www/vpn_ipsec_phase1.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php
index 33c570a..3119a81 100644
--- a/usr/local/www/vpn_ipsec.php
+++ b/usr/local/www/vpn_ipsec.php
@@ -350,7 +350,7 @@ include("head.inc");
 						<td class="listr" onclick="fr_toggle(<?=$i;?>)" id="frd<?=$i;?>">
 							<?=$spans;?>
 							<?php
-							if (empty($ph1ent['iketype']) || $ph1ent['iketype'] == "ikev1")
+							if (empty($ph1ent['iketype']) || $ph1ent['iketype'] == "ikev1" || $ph1ent['iketype'] == "auto")
 								echo "{$ph1ent['mode']}";
 							?>
 							<?=$spane;?>
diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php
index 9b2ecc3..a302eaf 100644
--- a/usr/local/www/vpn_ipsec_phase1.php
+++ b/usr/local/www/vpn_ipsec_phase1.php
@@ -333,7 +333,7 @@ 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");
+		$input_errors[] = gettext("IKE type must be v1, v2 or auto");
                 
         if (!empty($_POST['ealgo']) && isset($config['system']['crypto_hardware'])) {
             if ($config['system']['crypto_hardware'] == "glxsb") {
@@ -351,7 +351,7 @@ if ($_POST) {
 	if (!$input_errors) {
 		$ph1ent['ikeid'] = $pconfig['ikeid'];
 		$ph1ent['iketype'] = $pconfig['iketype'];
-		if ($pconfig['iketype'] != 'ikev1')
+		if ($pconfig['iketype'] != 'ikev1' && $pconfig['iketype'] != "auto")
 			unset($ph1ent['mode']);
 		else
 			$ph1ent['mode'] = $pconfig['mode'];
-- 
cgit v1.1