From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Fri, 24 May 2019 12:49:45 +0000 (-0400)
Subject: Merge pull request #1614 in SNORT/snort3 from ~KATHARVE/snort3:disable_builtin to... 
X-Git-Tag: 3.0.0-257~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35d4b9842345bcaa386457b0304f229c1fd73486;p=thirdparty%2Fsnort3.git

Merge pull request #1614 in SNORT/snort3 from ~KATHARVE/snort3:disable_builtin to master

Squashed commit of the following:

commit 7f281ab48cb16fbc99f619c1ae72841c0886bb85
Author: Katura Harvey <katharve@cisco.com>
Date:   Mon May 20 17:49:40 2019 -0400

    detection: fix check for disabled rules
---

diff --git a/src/detection/detection_engine.cc b/src/detection/detection_engine.cc
index 67eee2d1f..3c3bf1436 100644
--- a/src/detection/detection_engine.cc
+++ b/src/detection/detection_engine.cc
@@ -660,7 +660,7 @@ static int log_events(void* event, void* user)
     {
         en->rtn = getRtnFromOtn(en->otn);
 
-        if ( !en->rtn )
+        if ( !en->rtn || !en->rtn->enabled() )
             return 0;  // not enabled
     }