diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-09-29 19:24:20 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-09-29 19:24:20 -0500 |
| commit | d6bc3091168b9bcf2bcc69bbbbd6e20bee8901eb (patch) | |
| tree | c28c35d3325b7d50b4866fad3ed77c76dd88a4cb | |
| parent | e0c822a1f3c9705c89cc431b2afab354bcfcc1c2 (diff) | |
| download | pfsense-d6bc3091168b9bcf2bcc69bbbbd6e20bee8901eb.zip pfsense-d6bc3091168b9bcf2bcc69bbbbd6e20bee8901eb.tar.gz | |
Bring this back, I'll fix issues afterwards. Revert "Remove "auto", it's just a synonym for IKEv2. Ticket #4873"
This reverts commit 47f802694a1e1dfbbd011d7ec431c0948358b5c3.
| -rw-r--r-- | etc/inc/vpn.inc | 4 | ||||
| -rw-r--r-- | usr/local/www/vpn_ipsec_phase1.php | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 7e129ca..1f19959 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -771,7 +771,9 @@ 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 b25e52d..9b2ecc3 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") - $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"); if (!empty($_POST['ealgo']) && isset($config['system']['crypto_hardware'])) { if ($config['system']['crypto_hardware'] == "glxsb") { @@ -625,7 +625,7 @@ function dpdchkbox_change() { <td width="78%" class="vtable"> <select name="iketype" class="formselect" onchange='iketype_change()'> <?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\""; ?>> |
