diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-28 11:21:28 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-28 11:21:28 -0400 |
| commit | 3062d6f7e454a261858cfc8934ad1cd9b45d7870 (patch) | |
| tree | 108bc775c4292ee54bdf73d9262441d378979773 /etc/inc | |
| parent | 8a385f42742b9f1da57f53639436f7bea0c5ada1 (diff) | |
| parent | e8c8891d0c787f656bc5147b4fac21f3e2746b8a (diff) | |
| download | pfsense-3062d6f7e454a261858cfc8934ad1cd9b45d7870.zip pfsense-3062d6f7e454a261858cfc8934ad1cd9b45d7870.tar.gz | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/filter.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 7d39662..240c252 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -277,8 +277,6 @@ function filter_configure_sync() { $rules .= "set limit table-entries {$config['system']['maximumtableentries']}\n"; } - //$rules .= discover_pkg_rules("pfearly"); - // Configure flowtable support if enabled. flowtable_configure(); @@ -2156,7 +2154,7 @@ function filter_rules_generate() { $pptpdcfg = $config['pptpd']; $ipfrules = ""; - //$ipfrules .= discover_pkg_rules("filter"); + $ipfrules .= discover_pkg_rules("pfearly"); /* relayd */ $ipfrules .= "anchor \"relayd/*\"\n"; @@ -2531,6 +2529,7 @@ EOD; $rule_arr = array_merge($rule_arr1,$rule_arr2); $ipfrules .= "\n# User-defined rules follow\n"; + $ipfrules .= "\nanchor \"userrules/*\"\n"; /* Generate user rule lines */ foreach($rule_arr as $rule) { if(isset($rule['disabled'])) |
