summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-06-23 14:11:37 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-06-23 14:11:37 -0300
commitd30038e07914fd3cc4468e0e5002bc09145dabc3 (patch)
tree48984f6d0c0660433907ab23819f34db673c5536 /etc
parent019ee2bc8cd2422aa8c3dc4e16d0a79ad42dc9ff (diff)
downloadpfsense-d30038e07914fd3cc4468e0e5002bc09145dabc3.zip
pfsense-d30038e07914fd3cc4468e0e5002bc09145dabc3.tar.gz
Partially revert 019ee2bc8c, this workaround is not necessary. Real fix will be committed after this
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/vpn.inc8
1 files changed, 0 insertions, 8 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index df0462d..96ba4a7 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -647,14 +647,6 @@ EOD;
if (!empty($ph1ent['pre-shared-key'])) {
$pskconf .= "{$myid} {$peerid} : PSK 0s" . base64_encode(trim($ph1ent['pre-shared-key'])) . "\n";
-
- /*
- * XXX: Remove after following strongswan issue is fixed:
- *https://wiki.strongswan.org/issues/1004
- */
- if ($peerid_type == 'address' && is_fqdn($ph1ent['remote-gateway'])) {
- $pskconf .= "{$myid} @{$ph1ent['remote-gateway']} : PSK 0s" . base64_encode(trim($ph1ent['pre-shared-key'])) . "\n";
- }
}
}
}
OpenPOWER on IntegriCloud