detect: consolidate more setup into DetectEngineCtxInit

Loading of classifications, references and action order was done
unconditionally, so can be done in one place.

diff --git a/src/detect-engine.c b/src/detect-engine.c
index 248927822a1790b733eaa26abd9b6b87d888b406..9b2058ddb60a6d6019b7de25ab18fbeb7aabc7cc 100644 (file)
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -551,13 +551,6 @@ static void *DetectEngineLiveRuleSwap(void *arg)
         goto error;
     }
 
-    SCClassConfLoadClassficationConfigFile(de_ctx);
-    SCRConfLoadReferenceConfigFile(de_ctx);
-
-    if (ActionInitConfig() < 0) {
-        exit(EXIT_FAILURE);
-    }
-
     if (SigLoadSignatures(de_ctx, NULL, FALSE) < 0) {
         SCLogError(SC_ERR_NO_RULES_LOADED, "Loading signatures failed.");
         if (de_ctx->failure_fatal)
@@ -879,6 +872,13 @@ DetectEngineCtx *DetectEngineCtxInit(void)
     SCProfilingKeywordInitCounters(de_ctx);
 #endif
 
+    SCClassConfLoadClassficationConfigFile(de_ctx);
+    SCRConfLoadReferenceConfigFile(de_ctx);
+
+    if (ActionInitConfig() < 0) {
+        goto error;
+    }
+
     return de_ctx;
 error:
     return NULL;

diff --git a/src/suricata.c b/src/suricata.c
index d385b5b381f209d35cd90e3997c83152c4207217..12458caf70e84b7f5467debdfb789974b473dc4d 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -2312,12 +2312,6 @@ int main(int argc, char **argv)
             CudaVarsSetDeCtx(de_ctx);
 #endif /* __SC_CUDA_SUPPORT__ */
 
-        SCClassConfLoadClassficationConfigFile(de_ctx);
-        SCRConfLoadReferenceConfigFile(de_ctx);
-
-        if (ActionInitConfig() < 0) {
-            exit(EXIT_FAILURE);
-        }
     } else {
         /* disable raw reassembly */
         (void)ConfSetFinal("stream.reassembly.raw", "false");