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:05:48 -0500 |
| commit | f30e15fa3308143b9966548d96d8dadb55fb463a (patch) | |
| tree | b33e26d70e3fb18737023761213a53ed8139562a | |
| parent | d96b85e38bc123bf1c9ee945b4a6aeac537f7b47 (diff) | |
| download | pfsense-f30e15fa3308143b9966548d96d8dadb55fb463a.zip pfsense-f30e15fa3308143b9966548d96d8dadb55fb463a.tar.gz | |
Handle mode correctly with Auto IKE. Ticket #6360
| -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']; |
