From: Russ Combs <rucombs@cisco.com>
Date: Sat, 19 Aug 2017 02:24:02 +0000 (-0400)
Subject: Squashed commit of the following:
X-Git-Tag: 3.0.0-240~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d210806280f6cdea72ec23b559267b2ec320145f;p=thirdparty%2Fsnort3.git

Squashed commit of the following:

commit ee787c62ce89880b0dd6a0b2df06886f0e171e3b
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Aug 18 20:54:07 2017 -0400

    snort2lua: fix borked build broke by binder order
---

diff --git a/tools/snort2lua/helpers/parse_cmd_line.cc b/tools/snort2lua/helpers/parse_cmd_line.cc
index 216c47fb2..80c20e392 100644
--- a/tools/snort2lua/helpers/parse_cmd_line.cc
+++ b/tools/snort2lua/helpers/parse_cmd_line.cc
@@ -282,11 +282,13 @@ static void print_version(const char* /*key*/, const char* /*val*/)
     std::cout << "Snort2Lua\t0.2.0";
 }
 
+#ifdef REG_TEST
 static void print_binder_order(const char* /*key*/, const char* /*val*/)
 {
     print_binder_priorities();
     exit(0);
 }
+#endif
 
 static void help(const char* key, const char* val)
 {
@@ -394,7 +396,7 @@ static ConfigFunc basic_opts[] =
       "Same as '-a'. default option.  print all data" },
 
 #ifdef REG_TEST
-    { "print-binding-order", print_binder_order, ""
+    { "print-binding-order", print_binder_order, "",
       "Print sorting priority used when generating binder table" },
 #endif