From ddabd9d679cde715f21cb53de06a1292d05a3e01 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Wed, 19 Nov 2014 08:54:31 +0100
Subject: Ticket #3987. Strongswan support autodetection of IKE version
 exchange. Support this by allowing an auto version in the GUI.

---
 usr/local/www/vpn_ipsec_phase1.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php
index 15e71fe..b49559f 100644
--- a/usr/local/www/vpn_ipsec_phase1.php
+++ b/usr/local/www/vpn_ipsec_phase1.php
@@ -317,8 +317,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")
-		$input_errors[] = gettext("Valid arguments for IKE type is v1 or v2");
+	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");
 
 	/* build our encryption algorithms array */
 	$pconfig['ealgo'] = array();
@@ -569,7 +569,7 @@ function dpdchkbox_change() {
 						<td width="78%" class="vtable">
 							<select name="iketype" class="formselect">
 							<?php
-								$keyexchange = array("ikev1" => "V1", "ikev2" => "V2");
+								$keyexchange = array("ikev1" => "V1", "ikev2" => "V2", "auto" => "Auto");
 								foreach ($keyexchange as $kidx => $name):
 							?>
 								<option value="<?=$kidx;?>" <?php if ($kidx == $pconfig['iketype']) echo "selected=\"selected\""; ?>>
-- 
cgit v1.1