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

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 67eee2d1f3f5c2fde5f8b8600635438f804badf0..3c3bf1436c6e1566dce53d9e864dc0f4a690d9bb 100644 (file)
--- 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
     }