Merge pull request #1544 in SNORT/snort3 from ~SMINUT/snort3:snort2lua_max_sessions...

Squashed commit of the following:

commit e04a522a4798c2700eb137ab9f245b5ae2fb444e
Author: Silviu Minut <sminut@cisco.com>
Date:   Tue Mar 12 15:48:24 2019 -0400

    snort2lua: change the -l short option to --dont-convert-max-sessions.

diff --git a/tools/snort2lua/helpers/parse_cmd_line.cc b/tools/snort2lua/helpers/parse_cmd_line.cc
index 6d1e7681ade8dd5a15ec6bd9472732340b31a55e..bd2a021e34e675b86942133ccfad196eaa3fd9f0 100644 (file)
--- a/tools/snort2lua/helpers/parse_cmd_line.cc
+++ b/tools/snort2lua/helpers/parse_cmd_line.cc
@@ -356,9 +356,6 @@ static ConfigFunc basic_opts[] =
       "if <snort_conf> file contains any <include_file> or <policy_file> "
       "(i.e. 'include path/to/conf/other_conf'), do NOT parse those files" },
 
-    { "l", dont_convert_max_session, "",
-      "do not convert max_tcp, max_udp, max_icmp, max_ip to max_session" },
-
     { "m", add_remark, "",
       "add a remark to the end of every converted rule" },
 
@@ -392,6 +389,9 @@ static ConfigFunc basic_opts[] =
       "Same as '-p'. if <snort_conf> file contains any <include_file> or <policy_file> "
       "(i.e. 'include path/to/conf/other_conf'), do NOT parse those files" },
 
+    { "dont-convert-max-sessions", dont_convert_max_session, "",
+      "do not convert max_tcp, max_udp, max_icmp, max_ip to max_session" },
+
     { "error-file", parse_error_file, "<error_file>",
       "Same as '-e'. output all errors to <error_file>" },