Merge pull request #1050 in SNORT/snort3 from firewall_cleanup4 to master

Squashed commit of the following:

commit 93989353af61ea25e9b36c9e7a658d5d1b8b2275
Author: Steve Chew <stechew@cisco.com>
Date:   Fri Oct 20 00:48:32 2017 -0400

    Snort2lua: No longer allow vlan or mpls logging to be turned off.

diff --git a/tools/snort2lua/output_states/out_sfunified2.cc b/tools/snort2lua/output_states/out_sfunified2.cc
index ac3d07ae03554b4023fda31ef113ebf5996eb086..00a11561e789dd2d0a0038460d4892083757a5d1 100644 (file)
--- a/tools/snort2lua/output_states/out_sfunified2.cc
+++ b/tools/snort2lua/output_states/out_sfunified2.cc
@@ -60,10 +60,10 @@ namespace output
                 tmpval = table_api.add_option("no_timestamp", true);
 
             else if (keyword == "mpls_event_types")
-                tmpval = table_api.add_option("mpls_event_types", true);
+                tmpval = table_api.add_deleted_comment("mpls_event_types");
 
             else if (keyword == "vlan_event_types")
-                tmpval = table_api.add_option("vlan_event_types", true);
+                tmpval = table_api.add_deleted_comment("vlan_event_types");
 
             else if (keyword == "filename")
                 tmpval = parse_string_option("filename", arg_stream);