aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2013-03-22 21:14:54 -0700
committerChris Buechler <cmb@pfsense.org>2013-03-22 21:14:54 -0700
commite9360d27f92fd405cb95d0d89c8d57e479e39421 (patch)
tree83ef97a7b317a973af87b40a3220fef94f42fe8a
parent5c31da979d885727448f8009748fc60a751f974d (diff)
parent6e92c34f5c39d7af5fcd90b0e274ddf71a0083ce (diff)
downloadpfsense-packages-e9360d27f92fd405cb95d0d89c8d57e479e39421.tar.gz
pfsense-packages-e9360d27f92fd405cb95d0d89c8d57e479e39421.tar.bz2
pfsense-packages-e9360d27f92fd405cb95d0d89c8d57e479e39421.zip
Merge pull request #412 from bmeeks8/master
Fix logic bug in preproc auto-rule-disable so it skips already disabled rules
-rwxr-xr-xconfig/snort/snort.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index 6af50ffe..27d0b7e5 100755
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -1855,7 +1855,8 @@ function snort_filter_preproc_rules($snortcfg, &$active_rules) {
***************************************************/
foreach ($active_rules as $k1 => $rulem) {
foreach ($rulem as $k2 => $v) {
- if ($v['disabled'] == 0)
+ /* If rule is already disabled, skip it. */
+ if ($v['disabled'] == 1)
continue;
foreach ($rule_opts_preprocs as $opt => $preproc) {
$pcre = "/\s*\b" . $opt . "/i";