Fix live rule reload confusing delayed detect

Fixes bug 1023 and the previous attempt to fix it.

diff --git a/src/suricata.c b/src/suricata.c
index ccd918bf25cabc761bf1ef7376c0cbe60ebef71a..9cb54faf2c9e3bf3a4d0e4c5937d27e8be2522a4 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -2014,8 +2014,6 @@ int main(int argc, char **argv)
     if (suri.rule_reload) {
         if (suri.sig_file != NULL)
             UtilSignalHandlerSetup(SIGUSR2, SignalHandlerSigusr2SigFileStartup);
-        else if (suri.delayed_detect)
-            UtilSignalHandlerSetup(SIGUSR2, SignalHandlerSigusr2DelayedDetect);
         else
             UtilSignalHandlerSetup(SIGUSR2, SignalHandlerSigusr2Idle);
     } else {
@@ -2077,7 +2075,7 @@ int main(int argc, char **argv)
 
     /* registering singal handlers we use.  We register usr2 here, so that one
      * can't call it during the first sig load phase */
-    if (suri.sig_file == NULL && suri.rule_reload == 1)
+    if (suri.sig_file == NULL && suri.rule_reload == 1 && suri.delayed_detect == 0)
         UtilSignalHandlerSetup(SIGUSR2, SignalHandlerSigusr2);
 
     SCAsn1LoadConfig();
@@ -2154,7 +2152,7 @@ int main(int argc, char **argv)
             if (suri.sig_file != NULL)
                 UtilSignalHandlerSetup(SIGUSR2, SignalHandlerSigusr2SigFileStartup);
             else
-                UtilSignalHandlerSetup(SIGUSR2, SignalHandlerSigusr2Idle);
+                UtilSignalHandlerSetup(SIGUSR2, SignalHandlerSigusr2);
         }
         SCLogNotice("Signature(s) loaded, Detect thread(s) activated.");
     }