From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Tue, 19 Jun 2018 20:31:13 +0000 (-0400)
Subject: Merge pull request #1273 in SNORT/snort3 from snort2lua_missing to master
X-Git-Tag: 3.0.0-246~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=502ea87c5fcb174f388c45cf0439cce1c9df1d97;p=thirdparty%2Fsnort3.git

Merge pull request #1273 in SNORT/snort3 from snort2lua_missing to master

Squashed commit of the following:

commit 2e9ad79321cb410c9f5a04009aa7b678943086c8
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Jun 14 13:01:06 2018 -0400

    snort2lua: added missing keyword to nap parsing
---

diff --git a/tools/snort2lua/preprocessor_states/pps_nap_selector.cc b/tools/snort2lua/preprocessor_states/pps_nap_selector.cc
index 67bcf0fe3..fe0a35f27 100644
--- a/tools/snort2lua/preprocessor_states/pps_nap_selector.cc
+++ b/tools/snort2lua/preprocessor_states/pps_nap_selector.cc
@@ -206,6 +206,12 @@ public:
                 cv.get_table_api().close_table();
                 tmpval = eat_option(data_stream);
             }
+            else if ( keyword == "fw_required" )
+            {
+                cv.get_table_api().open_top_level_table("binder");
+                cv.get_table_api().add_deleted_comment("fw_required");
+                cv.get_table_api().close_table();
+            }
             else
                 tmpval = false;