summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2014-12-30 23:24:31 +0545
committerPhil Davis <phil.davis@inf.org>2014-12-30 23:24:31 +0545
commit43531ed73a33deb83e110e1cd03a04353ed8bf5c (patch)
treef5d0d3c1743e035e1d0a1dd97781c6da928074f4 /usr/local
parent565dcf3c3c6299695058d616cdad95a5d300288e (diff)
downloadpfsense-43531ed73a33deb83e110e1cd03a04353ed8bf5c.zip
pfsense-43531ed73a33deb83e110e1cd03a04353ed8bf5c.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/local')
-rw-r--r--usr/local/www/diag_ipsec.php2
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}");
OpenPOWER on IntegriCloud