]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
detect: fix settings override for reloads 1577/head
authorVictor Julien <victor@inliniac.net>
Mon, 6 Jul 2015 11:33:36 +0000 (13:33 +0200)
committerVictor Julien <victor@inliniac.net>
Mon, 6 Jul 2015 11:33:36 +0000 (13:33 +0200)
src/detect-engine.c

index 3017f2b32e2ec6b5f60a3e4ecd0ba166795352f9..6ac78654db63623cbf8b4930e5c3a4486494300e 100644 (file)
@@ -1747,19 +1747,12 @@ int DetectEngineReload(const char *filename)
     char prefix[128] = "";
     if (filename != NULL) {
         snprintf(prefix, sizeof(prefix), "detect-engine-reloads.%d", reloads++);
-
-        ConfNode *node = ConfGetNode(prefix);
-        if (node != NULL) {
-            SCLogError(SC_ERR_CONF_YAML_ERROR, "reload %d already loaded", reloads-1);
-            return -1;
-        }
-
         if (ConfYamlLoadFileWithPrefix(filename, prefix) != 0) {
             SCLogError(SC_ERR_CONF_YAML_ERROR, "failed to load yaml %s", filename);
             return -1;
         }
 
-        node = ConfGetNode(prefix);
+        ConfNode *node = ConfGetNode(prefix);
         if (node == NULL) {
             SCLogError(SC_ERR_CONF_YAML_ERROR, "failed to properly setup yaml %s", filename);
             return -1;