From: Amarnath Sathyanarayanan (amsathya) <amsathya@cisco.com>
Date: Tue, 8 Oct 2019 22:06:34 +0000 (-0400)
Subject: Merge pull request #1786 in SNORT/snort3 from ~RUTIAN/snort3:identity to master
X-Git-Tag: 3.0.0-262~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1b74aa9241fb0fc6b3d731c0b425efe96e38e41;p=thirdparty%2Fsnort3.git

Merge pull request #1786 in SNORT/snort3 from ~RUTIAN/snort3:identity to master

Squashed commit of the following:

commit db0e98c934e4c092a3a7f6f77c75d8da3752c925
Author: Ruiqi Tian <rutian@cisco.com>
Date:   Tue Oct 8 11:11:53 2019 -0400

    snort2lua: remove identity related options from firewall
---

diff --git a/tools/snort2lua/preprocessor_states/pps_firewall.cc b/tools/snort2lua/preprocessor_states/pps_firewall.cc
index f6b618a7a..751f5954b 100644
--- a/tools/snort2lua/preprocessor_states/pps_firewall.cc
+++ b/tools/snort2lua/preprocessor_states/pps_firewall.cc
@@ -113,9 +113,9 @@ namespace preprocessors
             else if (keyword == "fw_urlc_memcap")
                 tmpval = parse_int_option("url_cache_memcap", data_stream, false);
             else if (keyword == "fw_usrq_memcap")
-                tmpval = parse_int_option("user_queue_memcap", data_stream, false);
+                tmpval = parse_deleted_option("user_queue_memcap", data_stream);
             else if (keyword == "fw_usrc_memcap")
-                tmpval = parse_int_option("user_cache_memcap", data_stream, false);
+                tmpval = parse_deleted_option("user_cache_memcap", data_stream);
             else if (keyword == "fw_malwq_memcap")
                 tmpval = parse_int_option("malware_queue_memcap", data_stream, false);
             else if (keyword == "fw_malwc_memcap")
@@ -163,13 +163,13 @@ namespace preprocessors
             else if (keyword == "debug_future_date")
                 tmpval = table_api.add_option("future_date_debug_enabled", true);
             else if (keyword == "identity_rule_path")
-                identity_table = tmpval = parse_string_option("identity_rule_path", data_stream);
+                identity_table = tmpval = parse_deleted_option("identity_rule_path", data_stream);
             else if (keyword == "interface_ip_map_path")
-                tmpval = parse_string_option("intf_ip_map_path", data_stream);
+                tmpval = parse_deleted_option("intf_ip_map_path", data_stream);
             else if (keyword == "daqif_path")
-                tmpval = parse_string_option("daq_intf_path", data_stream);
+                tmpval = parse_deleted_option("daq_intf_path", data_stream);
             else if (keyword == "running_config_network_path")
-                tmpval = parse_string_option("running_network_config_path", data_stream);
+                tmpval = parse_deleted_option("running_network_config_path", data_stream);
             else
                 tmpval = false;