summaryrefslogtreecommitdiffstats
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:12:36 -0300
commitbc7748f76c2deb0c593290e289dcd588006e7165 (patch)
treeabd70a10931555c7a3c6a606b43031f69ca6f4ce
parent29c9e14002b4a1566fa6afc6c4933b384b8e2242 (diff)
downloadpfsense-bc7748f76c2deb0c593290e289dcd588006e7165.zip
pfsense-bc7748f76c2deb0c593290e289dcd588006e7165.tar.gz
Partially revert 019ee2bc8c, this workaround is not necessary. Real fix will be committed after this
-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 7c4b626..1bf7fa9 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -591,14 +591,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