diff options
| author | Ermal Luçi <eri@pfsense.org> | 2009-02-28 19:12:27 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2009-02-28 19:12:52 +0000 |
| commit | bfdf32ff12e11ef326574aadf4971c3e187e0765 (patch) | |
| tree | c5326402e2db1981c8312120ca6ebc1d0242b9f5 /etc | |
| parent | 30bc15cfdc0432dc57dbc80d50ca2430f9e660c1 (diff) | |
| download | pfsense-bfdf32ff12e11ef326574aadf4971c3e187e0765.zip pfsense-bfdf32ff12e11ef326574aadf4971c3e187e0765.tar.gz | |
Move some special packages rule creation after user rules so the latest have precedence over the others.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 2da313d..e6f5335 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -1828,24 +1828,10 @@ function filter_rules_generate() $mt = microtime(); echo "filter_rules_generate() being called $mt\n"; } + $pptpdcfg = $config['pptpd']; $pppoecfg = $config['pppoe']; - if (is_package_installed('clamav') && file_exists('/usr/local/pkg/clamav.inc')) { - require_once('clamav.inc'); - $ipfrules .= clamav_generate_rules('filter'); - } - if (is_package_installed('squid') && file_exists('/usr/local/pkg/squid.inc')) { - require_once('squid.inc'); - $ipfrules .= squid_generate_rules('filter'); - } - if (is_package_installed('frickin') && file_exists('/usr/local/pkg/frickin.inc')) { - require_once ('frickin.inc'); - $ipfrules .= frickin_generate_rules('filter'); - } - if (is_package_installed('siproxd') && file_exists('/usr/local/pkg/siproxd.inc')) { - require_once('siproxd.inc'); - $ipfrules .= siproxd_generate_rules('filter'); - } + /* if captive portal is enabled, ensure that access to this port * is allowed on a locked down interface */ @@ -2184,6 +2170,23 @@ EOD; update_filter_reload_status("Creating IPsec rules..."); $ipfrules .= generate_ipsec_filter_rules(); + if (is_package_installed('clamav') && file_exists('/usr/local/pkg/clamav.inc')) { + require_once('clamav.inc'); + $ipfrules .= clamav_generate_rules('filter'); + } + if (is_package_installed('squid') && file_exists('/usr/local/pkg/squid.inc')) { + require_once('squid.inc'); + $ipfrules .= squid_generate_rules('filter'); + } + if (is_package_installed('frickin') && file_exists('/usr/local/pkg/frickin.inc')) { + require_once ('frickin.inc'); + $ipfrules .= frickin_generate_rules('filter'); + } + if (is_package_installed('siproxd') && file_exists('/usr/local/pkg/siproxd.inc')) { + require_once('siproxd.inc'); + $ipfrules .= siproxd_generate_rules('filter'); + } + $ipfrules .= <<<EOD anchor "limitingesr" |
