diff options
| author | Matt Smith <mgsmith@netgate.com> | 2015-10-20 21:32:56 -0500 |
|---|---|---|
| committer | Matt Smith <mgsmith@netgate.com> | 2015-10-21 08:34:47 -0500 |
| commit | f3ee8205e6332d4895e93f4f2831cc65ab98d0c0 (patch) | |
| tree | cb09e7821901b440be8331f05c0f7369ba6c316b | |
| parent | 1eac7c1e3c96315c957d38a0ae1d8c2c58f99090 (diff) | |
| download | pfsense-f3ee8205e6332d4895e93f4f2831cc65ab98d0c0.zip pfsense-f3ee8205e6332d4895e93f4f2831cc65ab98d0c0.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.
| -rw-r--r-- | etc/inc/vpn.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 7ff5146..d3baf1b 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -473,9 +473,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'])) { @@ -527,6 +524,7 @@ EOD; } if (!empty($net_list)) { + $strongswan .= "\t\t\tsubnet = {$net_list}\n"; $strongswan .= "\t\t\tsplit-include = {$net_list}\n"; unset($net_list); } |
