From: Eric Leblond <eric@regit.org>
Date: Fri, 2 Nov 2012 15:21:36 +0000 (+0100)
Subject: list-keywords: fix when not using default install
X-Git-Tag: suricata-1.4rc1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42ace54137fc8e272f1d717477c355de61b62126;p=thirdparty%2Fsuricata.git

list-keywords: fix when not using default install

As we don't parse the YAML file when listing of keywords is asked,
suricata make a test on existence of the build-default directory.
So with a non standard (working) install (even a single configure
without option lead to a failure), the keyword listing fails
because the default logging directory does not exist.
---

diff --git a/src/suricata.c b/src/suricata.c
index 3e714a42dd..25c36b8bef 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -1315,15 +1315,18 @@ int main(int argc, char **argv)
         log_dir = DEFAULT_LOG_DIR;
 #endif /* OS_WIN32 */
     }
+
+    if (!list_keywords && !list_app_layer_protocols) {
 #ifdef OS_WIN32
-    if (_stat(log_dir, &buf) != 0) {
+        if (_stat(log_dir, &buf) != 0) {
 #else
-    if (stat(log_dir, &buf) != 0) {
+        if (stat(log_dir, &buf) != 0) {
 #endif /* OS_WIN32 */
-        SCLogError(SC_ERR_LOGDIR_CONFIG, "The logging directory \"%s\" "
-                    "supplied by %s (default-log-dir) doesn't exist. "
-                    "Shutting down the engine", log_dir, conf_filename);
-        exit(EXIT_FAILURE);
+            SCLogError(SC_ERR_LOGDIR_CONFIG, "The logging directory \"%s\" "
+                        "supplied by %s (default-log-dir) doesn't exist. "
+                        "Shutting down the engine", log_dir, conf_filename);
+            exit(EXIT_FAILURE);
+        }
     }
 
     /* Pull the max pending packets from the config, if not found fall