detect/analyzer: disable automatic json output

EngineAnalysisRules2 was in a strange location where it did not respect
the --engine-analysis flag. It has been moved to the same call location
as EngineAnalysisRules.

diff --git a/src/detect-engine-build.c b/src/detect-engine-build.c
index 47b1d24dc41ea57ba34810139617fb3320f1b7a8..a0b632480fb99c119290feed3585a9961cfff755 100644 (file)
--- a/src/detect-engine-build.c
+++ b/src/detect-engine-build.c
@@ -1855,9 +1855,6 @@ static int SigMatchPrepare(DetectEngineCtx *de_ctx)
             SigMatch *sm = s->init_data->smlists[type];
             s->sm_arrays[type] = SigMatchList2DataArray(sm);
         }
-#ifdef HAVE_LIBJANSSON
-        EngineAnalysisRules2(de_ctx, s);
-#endif
         /* free lists. Ctx' are xferred to sm_arrays so won't get freed */
         uint32_t i;
         for (i = 0; i < s->init_data->smlists_array_size; i++) {

diff --git a/src/detect-engine-loader.c b/src/detect-engine-loader.c
index 7b9a4a2fa69a1ccc6c4d6a9b67d28ca405c0b67d..235a9973502e88cdfe24c97dc4f5890cf0da589f 100644 (file)
--- a/src/detect-engine-loader.c
+++ b/src/detect-engine-loader.c
@@ -175,6 +175,9 @@ static int DetectLoadSigFile(DetectEngineCtx *de_ctx, char *sig_file,
                 }
                 if (rule_engine_analysis_set) {
                     EngineAnalysisRules(de_ctx, sig, line);
+#ifdef HAVE_LIBJANSSON
+                    EngineAnalysisRules2(de_ctx, sig);
+#endif
                 }
             }
             SCLogDebug("signature %"PRIu32" loaded", sig->id);