]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
Fix commandline supplied yaml path being ignored.
authorVictor Julien <victor@inliniac.net>
Mon, 11 Jun 2012 20:46:25 +0000 (22:46 +0200)
committerVictor Julien <victor@inliniac.net>
Mon, 11 Jun 2012 20:46:25 +0000 (22:46 +0200)
src/suricata.c

index 1d71725ac07cc5567cfe46f6f671322fdd057385..d1c4d93a9b72f5073713f2bf32f6638aa6387026 100644 (file)
@@ -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 */