]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
Remove the old include support.
authorJason Ish <jason.ish@emulex.com>
Fri, 6 Dec 2013 19:38:26 +0000 (13:38 -0600)
committerVictor Julien <victor@inliniac.net>
Fri, 10 Jan 2014 15:20:56 +0000 (16:20 +0100)
src/suricata.c

index b788c90d3d1c8ca75849b582f1851d3d56b3a25b..221653d4860ad13ac44bd53d2968c72a72a0fd56 100644 (file)
@@ -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);
 }