From: Jason Ish <jason.ish@emulex.com>
Date: Fri, 6 Dec 2013 19:38:26 +0000 (-0600)
Subject: Remove the old include support.
X-Git-Tag: suricata-2.0rc1~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5850607fea4cdd9a019b370cbf8891f272b5691a;p=thirdparty%2Fsuricata.git

Remove the old include support.
---

diff --git a/src/suricata.c b/src/suricata.c
index b788c90d3d..221653d486 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -815,20 +815,6 @@ TmEcode LoadYamlConfig(char *conf_filename) {
         SCReturnInt(TM_ECODE_FAILED);
     }
 
-    ConfNode *file;
-    ConfNode *includes = ConfGetNode("include");
-    if (includes != NULL) {
-        TAILQ_FOREACH(file, &includes->head, next) {
-            char *ifile = ConfLoadCompleteIncludePath(file->val);
-            SCLogInfo("Including: %s", ifile);
-
-            if (ConfYamlLoadFile(ifile) != 0) {
-                /* Error already displayed. */
-                SCReturnInt(TM_ECODE_FAILED);
-            }
-        }
-    }
-
     SCReturnInt(TM_ECODE_OK);
 }