summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-03-10 17:17:10 -0500
committerChris Buechler <cmb@pfsense.org>2015-03-10 17:20:42 -0500
commit24acc8f4668d23bd4a0cd515c6e1de84affd6069 (patch)
tree5904e430818005e80fd2d4fcdfddf5a2b7e54056 /etc
parent30ea15dc6337b0907c2401b11dbe66216f081e62 (diff)
downloadpfsense-24acc8f4668d23bd4a0cd515c6e1de84affd6069.zip
pfsense-24acc8f4668d23bd4a0cd515c6e1de84affd6069.tar.gz
Don't enable interfaces_use by default. Add checkbox to enable on Advanced
tab, in case there are scenarios where it's desirable. Ticket #4341
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/vpn.inc8
1 files changed, 6 insertions, 2 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index a148d0e..9c1e6db 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -342,8 +342,12 @@ function vpn_ipsec_configure($restart = false)
$unity_enabled = 'no';
}
- if (!empty($ifacesuse)) {
- $ifacesuse = 'interfaces_use = ' . implode(',', array_unique($ifacesuse));
+ if (isset($config['ipsec']['enableinterfacesuse'])) {
+ if (!empty($ifacesuse)) {
+ $ifacesuse = 'interfaces_use = ' . implode(',', array_unique($ifacesuse));
+ } else {
+ $ifacesuse = '';
+ }
} else {
$ifacesuse = '';
}
OpenPOWER on IntegriCloud