diff options
author | Chris Buechler <cmb@pfsense.org> | 2016-05-25 00:05:48 -0500 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2016-05-25 00:06:35 -0500 |
commit | 065a9cd8c62088b2d8adfd95b660358fb2cc466d (patch) | |
tree | 4926f3fc202339f39f6e14f8df1d8e3739a1afe9 /src/usr | |
parent | b81601048ae7664745af059b48e0e5bd26de82a6 (diff) | |
download | pfsense-065a9cd8c62088b2d8adfd95b660358fb2cc466d.zip pfsense-065a9cd8c62088b2d8adfd95b660358fb2cc466d.tar.gz |
Handle mode correctly with Auto IKE. Ticket #6360
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/local/www/vpn_ipsec.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/vpn_ipsec_phase1.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index 03d30a4..e26d1d7 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -355,7 +355,7 @@ display_top_tabs($tab_array); <td 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']}"; } ?> diff --git a/src/usr/local/www/vpn_ipsec_phase1.php b/src/usr/local/www/vpn_ipsec_phase1.php index 973bf6c..053b0c4 100644 --- a/src/usr/local/www/vpn_ipsec_phase1.php +++ b/src/usr/local/www/vpn_ipsec_phase1.php @@ -455,7 +455,7 @@ if ($_POST) { if (!$input_errors) { $ph1ent['ikeid'] = $pconfig['ikeid']; $ph1ent['iketype'] = $pconfig['iketype']; - if ($pconfig['iketype'] != 'ikev1') { + if ($pconfig['iketype'] == 'ikev2') { unset($ph1ent['mode']); } else { $ph1ent['mode'] = $pconfig['mode']; |