From: Victor Julien <victor@inliniac.net>
Date: Mon, 11 Jun 2012 20:46:25 +0000 (+0200)
Subject: Fix commandline supplied yaml path being ignored.
X-Git-Tag: suricata-1.3rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b210bf129025486f28ebec5e13d7c37dbb814d4c;p=thirdparty%2Fsuricata.git

Fix commandline supplied yaml path being ignored.
---

diff --git a/src/suricata.c b/src/suricata.c
index 1d71725ac0..d1c4d93a9b 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -1205,7 +1205,8 @@ int main(int argc, char **argv)
     if (run_mode != RUNMODE_UNITTEST &&
             !list_keywords &&
             !list_app_layer_protocols) {
-        conf_filename = DEFAULT_CONF_FILE;
+        if (conf_filename == NULL)
+            conf_filename = DEFAULT_CONF_FILE;
     }
 
     /** \todo we need an api for these */