From: Jason Ish <ish@unx.ca>
Date: Mon, 11 May 2015 22:50:19 +0000 (-0600)
Subject: conf - process includes even if not at root node.
X-Git-Tag: suricata-3.0RC1~410
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fdae82815802ccd6f84e4873de30f053736be09;p=thirdparty%2Fsuricata.git

conf - process includes even if not at root node.
---

diff --git a/src/conf-yaml-loader.c b/src/conf-yaml-loader.c
index d61e495ce1..13ec048845 100644
--- a/src/conf-yaml-loader.c
+++ b/src/conf-yaml-loader.c
@@ -244,9 +244,7 @@ ConfYamlParse(yaml_parser_t *parser, ConfNode *parent, int inseq)
                 }
                 else if (state == CONF_KEY) {
 
-                    /* Top level include statements. */
-                    if ((strcmp(value, "include") == 0) &&
-                        (parent == ConfGetRootNode())) {
+                    if (strcmp(value, "include") == 0) {
                         state = CONF_INCLUDE;
                         goto next;
                     }