summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-05-13 08:21:33 -0500
committerChris Buechler <cmb@pfsense.org>2016-05-13 08:22:09 -0500
commita23600ef647d614c2d5b221988ab2817972ff565 (patch)
treea01675cd0fc92c10bcc89aea5c070f7aba89acbb
parent535634e547150f72c5a5bd936d83c9d4c484e367 (diff)
downloadpfsense-a23600ef647d614c2d5b221988ab2817972ff565.zip
pfsense-a23600ef647d614c2d5b221988ab2817972ff565.tar.gz
Disable ipcomp regardless of config setting to avoid problem. Ticket #6167
-rw-r--r--src/etc/inc/vpn.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc
index 59671e6..1abf2fd 100644
--- a/src/etc/inc/vpn.inc
+++ b/src/etc/inc/vpn.inc
@@ -1365,10 +1365,11 @@ EOD;
EOD;
+ /* Disable ipcomp for now. redmine #6167
if (isset($config['ipsec']['compression'])) {
$ipsecconnect .= "\tcompress = yes\n";
$enablecompression = true;
- }
+ } */
if (!empty($ikelifeline)) {
$ipsecconnect .= "\t{$ikelifeline}\n";
}
OpenPOWER on IntegriCloud