]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
util-running-mode: setup config file
authorEric Leblond <eric@regit.org>
Tue, 27 Jan 2015 20:22:29 +0000 (21:22 +0100)
committerVictor Julien <victor@inliniac.net>
Fri, 17 Apr 2015 12:53:13 +0000 (14:53 +0200)
Without that we get warning message.

src/util-running-modes.c

index 07aeffef5f5a343fe16ca1dbf231916703a33bb6..8ad5a1eea8629c1dc24a930dff2216b52656ead8 100644 (file)
 #include "app-layer-parser.h"
 #include "util-cuda.h"
 #include "util-unittest.h"
+#include "util-debug.h"
+#include "conf-yaml-loader.h"
 
 int ListKeywords(const char *keyword_info)
 {
+    if (ConfYamlLoadFile(DEFAULT_CONF_FILE) != -1)
+        SCLogLoadConfig(0, 0);
     MpmTableSetup();
     AppLayerSetup();
     SigTableSetup(); /* load the rule keywords */
@@ -39,6 +43,8 @@ int ListKeywords(const char *keyword_info)
 
 int ListAppLayerProtocols()
 {
+    if (ConfYamlLoadFile(DEFAULT_CONF_FILE) != -1)
+        SCLogLoadConfig(0, 0);
     MpmTableSetup();
     AppLayerSetup();
     AppLayerListSupportedProtocols();