diff options
| author | Renato Botelho <renato@netgate.com> | 2016-12-29 18:12:40 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-12-29 18:23:25 -0200 |
| commit | 6522505ce70705243992cfab3cae4128a8516eac (patch) | |
| tree | 98ff5d3f5663c44ea5b806d653de75812a6e8336 | |
| parent | 9bf81d66b6434b62f7223e09f74d3ccb59943c95 (diff) | |
| download | pfsense-6522505ce70705243992cfab3cae4128a8516eac.zip pfsense-6522505ce70705243992cfab3cae4128a8516eac.tar.gz | |
Ticket #6920: Use filter_rule_function tag to detect function name
| -rw-r--r-- | src/etc/inc/filter.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc index 98274aa..3feb778 100644 --- a/src/etc/inc/filter.inc +++ b/src/etc/inc/filter.inc @@ -4223,6 +4223,9 @@ function discover_pkg_rules($ruletype) { $rules = ""; foreach ($config['installedpackages']['package'] as $package) { + if (empty($package['filter_rule_function'])) { + continue; + } if (!file_exists("/usr/local/pkg/" . $package['configurationfile'])) { continue; @@ -4232,7 +4235,7 @@ function discover_pkg_rules($ruletype) { $package['configurationfile'], 'packagegui'); $pkgname = substr(reverse_strrchr($package['configurationfile'], "."), 0, -1); - $pkg_generate_rules = "{$pkgname}_generate_rules"; + $pkg_generate_rules = $package['filter_rule_function']; update_filter_reload_status(sprintf(gettext( 'Checking for %1$s PF hooks in package %2$s'), $ruletype, |
