summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-04-06 18:22:27 +0000
committerErmal <eri@pfsense.org>2011-04-06 18:22:27 +0000
commit9a36dc9d241e004e7bcdec25def3b7b0c9d94cff (patch)
tree73fcdb080c0148030b453de49cd0bf322a17a7df /etc
parentab75b4ee5475fe1be718cb0e93d0a34f293c5ed0 (diff)
downloadpfsense-9a36dc9d241e004e7bcdec25def3b7b0c9d94cff.zip
pfsense-9a36dc9d241e004e7bcdec25def3b7b0c9d94cff.tar.gz
Resolves #1391. Bring back VPN auto rule disable advanced setting.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/filter.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index cde7a5f..8fdf752 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -2267,7 +2267,7 @@ EOD;
}
}
/* PPTPd enabled? */
- if($pptpdcfg['mode'] && ($pptpdcfg['mode'] != "off")) {
+ if($pptpdcfg['mode'] && ($pptpdcfg['mode'] != "off") && !isset($config['system']['disablevpnrules'])) {
if($pptpdcfg['mode'] == "server")
$pptpdtarget = get_interface_ip();
else
@@ -2700,6 +2700,9 @@ function filter_generate_ipsec_rules() {
echo "filter_generate_ipsec_rules() being called $mt\n";
}
+ if (isset($config['system']['disablevpnrules']))
+ return "\n# VPN Rules not added disabled in System->Advanced.\n";
+
$ipfrules = "\n# VPN Rules\n";
/* Is IP Compression enabled? */
if(isset($config['ipsec']['ipcomp']))
OpenPOWER on IntegriCloud