diff options
| author | Phil Davis <phil.davis@inf.org> | 2014-12-30 23:24:31 +0545 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2014-12-30 20:40:46 -0600 |
| commit | 6e26b9c554281014e51d6384edb7395b76d17063 (patch) | |
| tree | 92b672fddfb266b2903d34b22f1adc3e0a6ce560 /usr | |
| parent | c8c4520ae2cc54642e0cc131f5f3f558257f7f80 (diff) | |
| download | pfsense-6e26b9c554281014e51d6384edb7395b76d17063.zip pfsense-6e26b9c554281014e51d6384edb7395b76d17063.tar.gz | |
Allow for old settings that have no iketype
This bit of code looks like it could do with the same test as https://github.com/pfsense/pfsense/pull/1412
This is executed when the "Connect" button is pressed from Status->IPsec
Somebody with these problematic old IPsec entries could test this - with current code I suspect that disconnect followed by connect - it will not connect. With this change it will (might?) connect again.
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/diag_ipsec.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php index b14838f..08ce0f5 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -57,7 +57,7 @@ if ($_GET['act'] == 'connect') { if (ctype_digit($_GET['ikeid'])) { $ph1ent = ipsec_get_phase1($_GET['ikeid']); if (!empty($ph1ent)) { - if ($ph1ent['iketype'] == 'ikev1') { + if (empty($ph1ent['iketype']) || $ph1ent['iketype'] == 'ikev1') { $ph2entries = ipsec_get_number_of_phase2($_GET['ikeid']); for ($i = 0; $i < $ph2entries; $i++) { $connid = escapeshellarg("con{$_GET['ikeid']}00{$i}"); |
