From: Eric Leblond <eric@regit.org>
Date: Tue, 30 Jul 2013 13:21:55 +0000 (+0200)
Subject: Export IsRuleReloadSet and use it.
X-Git-Tag: suricata-2.0beta2~453
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=325462d396bf6ccd6b5aa0f1552da89c4505c645;p=thirdparty%2Fsuricata.git

Export IsRuleReloadSet and use it.
---

diff --git a/src/detect.c b/src/detect.c
index 0a2515b4f1..cf5eba5836 100644
--- a/src/detect.c
+++ b/src/detect.c
@@ -2612,7 +2612,9 @@ int SigAddressPrepareStage1(DetectEngineCtx *de_ctx) {
 
 #ifdef HAVE_LUAJIT
     /* run this before the mpm states are initialized */
-    if (DetectLuajitSetupStatesPool(de_ctx->detect_luajit_instances, rule_reload) != 0) {
+    if (DetectLuajitSetupStatesPool(de_ctx->detect_luajit_instances,
+                                    IsRuleReloadSet(TRUE))
+            != 0) {
         if (de_ctx->failure_fatal)
             return -1;
     }
diff --git a/src/suricata.c b/src/suricata.c
index f1249d6f54..68053c9915 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -800,7 +800,7 @@ TmEcode LoadYamlConfig(char *conf_filename) {
     SCReturnInt(TM_ECODE_OK);
 }
 
-static int IsRuleReloadSet(int quiet)
+int IsRuleReloadSet(int quiet)
 {
     int rule_reload;
 
diff --git a/src/suricata.h b/src/suricata.h
index 60b0d1e4d4..a6da0366c3 100644
--- a/src/suricata.h
+++ b/src/suricata.h
@@ -152,6 +152,7 @@ void SignalHandlerSigusr2Idle(int sig);
 
 int RunmodeIsUnittests(void);
 int RunmodeGetCurrent(void);
+int IsRuleReloadSet(int quiet);
 
 extern int run_mode;