From: Victor Julien <victor@inliniac.net>
Date: Mon, 19 Mar 2012 10:50:50 +0000 (+0100)
Subject: Make list-app-layer-protos option name match the help explanation. Make sure it works... 
X-Git-Tag: suricata-1.3beta1~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b3f6c464a07df13a2b81c5fcf9535ce3db14bb1;p=thirdparty%2Fsuricata.git

Make list-app-layer-protos option name match the help explanation. Make sure it works w/o passing a config.
---

diff --git a/src/suricata.c b/src/suricata.c
index 29f4dbb506..40c5951282 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -714,7 +714,7 @@ int main(int argc, char **argv)
         {"pcap", optional_argument, 0, 0},
         {"pcap-buffer-size", required_argument, 0, 0},
         {"unittest-filter", required_argument, 0, 'U'},
-        {"list-app-layer-protocols", 0, &list_app_layer_protocols, 1},
+        {"list-app-layer-protos", 0, &list_app_layer_protocols, 1},
         {"list-unittests", 0, &list_unittests, 1},
         {"list-cuda-cards", 0, &list_cuda_cards, 1},
         {"list-runmodes", 0, &list_runmodes, 1},
@@ -1219,7 +1219,8 @@ int main(int argc, char **argv)
         }
 
     } else if (run_mode != RUNMODE_UNITTEST &&
-               !list_keywords){
+                !list_keywords &&
+                !list_app_layer_protocols) {
         SCLogError(SC_ERR_OPENING_FILE, "Configuration file has not been provided");
         usage(argv[0]);
         exit(EXIT_FAILURE);