From: Victor Julien <victor@inliniac.net>
Date: Mon, 6 Jul 2015 11:33:36 +0000 (+0200)
Subject: detect: fix settings override for reloads
X-Git-Tag: suricata-3.0RC1~282
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1577%2Fhead;p=thirdparty%2Fsuricata.git

detect: fix settings override for reloads
---

diff --git a/src/detect-engine.c b/src/detect-engine.c
index 3017f2b32e..6ac78654db 100644
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -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;