files: fix FILE_USE_DETECT with --disable-detection

Don't set FILE_USE_DETECT flag if detect is disabled.
pull/4434/head
Victor Julien 7 years ago
parent 4ac9cd2c70
commit 682014619f

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

Loading…
Cancel
Save