summaryrefslogtreecommitdiffstats
path: root/src/etc/inc
diff options
context:
space:
mode:
authorMatt Smith <mgsmith@netgate.com>2015-10-21 08:33:54 -0500
committerMatt Smith <mgsmith@netgate.com>2015-10-21 08:34:24 -0500
commit41f7b662932422f176151532a97858e683f50abd (patch)
tree33267f14fe2d44e822f7f0c7e868a585686a5481 /src/etc/inc
parent141462faf292b6ab5e0e87191e299f6bd59fb79c (diff)
downloadpfsense-41f7b662932422f176151532a97858e683f50abd.zip
pfsense-41f7b662932422f176151532a97858e683f50abd.tar.gz
Make setting charon.plugins.attr.subnet conditional on net_list being set. Set
it's value to list of subnets configured as P2's for mobile IPsec. Fixes #5327.
Diffstat (limited to 'src/etc/inc')
-rw-r--r--src/etc/inc/vpn.inc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc
index d6141d4..06da50d 100644
--- a/src/etc/inc/vpn.inc
+++ b/src/etc/inc/vpn.inc
@@ -469,9 +469,6 @@ EOD;
if (is_array($a_client) && isset($a_client['enable'])) {
$strongswan .= "\t\tattr {\n";
- if ($a_client['pool_address'] && $a_client['pool_netbits']) {
- $strongswan .= "\t\t\tsubnet = {$a_client['pool_address']}/{$a_client['pool_netbits']}\n";
- }
$cfgservers = array();
if (!empty($a_client['dns_server1'])) {
@@ -523,6 +520,7 @@ EOD;
}
if (!empty($net_list)) {
+ $strongswan .= "\t\t\tsubnet = {$net_list}\n";
$strongswan .= "\t\t\tsplit-include = {$net_list}\n";
unset($net_list);
}
OpenPOWER on IntegriCloud