From: Victor Julien <victor@inliniac.net>
Date: Sun, 24 Nov 2019 08:16:29 +0000 (+0100)
Subject: files: fix FILE_USE_DETECT with --disable-detection
X-Git-Tag: suricata-5.0.1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=682014619f29676f1aab0421ff810318c6f30eb2;p=thirdparty%2Fsuricata.git

files: fix FILE_USE_DETECT with --disable-detection

Don't set FILE_USE_DETECT flag if detect is disabled.
---

diff --git a/src/util-file.c b/src/util-file.c
index aaf631c767..54e773b60c 100644
--- a/src/util-file.c
+++ b/src/util-file.c
@@ -37,6 +37,8 @@
 #include "app-layer-parser.h"
 #include "util-validate.h"
 
+extern int g_detect_disabled;
+
 /** \brief switch to force filestore on all files
  *         regardless of the rules.
  */
@@ -835,7 +837,7 @@ static File *FileOpenFile(FileContainer *ffc, const StreamingBufferConfig *sbcfg
         SCLogDebug("not doing sha256 for this file");
         ff->flags |= FILE_NOSHA256;
     }
-    if (flags & FILE_USE_DETECT) {
+    if (!g_detect_disabled && flags & FILE_USE_DETECT) {
         SCLogDebug("considering content_inspect tracker when pruning");
         ff->flags |= FILE_USE_DETECT;
     }