From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Wed, 24 Apr 2019 21:44:11 +0000 (-0400)
Subject: Merge pull request #1586 in SNORT/snort3 from ~KATHARVE/snort3:remove_histogram_comme... 
X-Git-Tag: 3.0.0-254~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d7cfb648fc3e4833f7dab760deaeaf542d62585;p=thirdparty%2Fsnort3.git

Merge pull request #1586 in SNORT/snort3 from ~KATHARVE/snort3:remove_histogram_comment to master

Squashed commit of the following:

commit 3e8b8b74d24b518199b988c5ff21ccbfb995336d
Author: Katura Harvey <katharve@cisco.com>
Date:   Fri Apr 19 19:40:34 2019 -0400

    snort2lua: fix histogram option change comment
---

diff --git a/tools/snort2lua/preprocessor_states/pps_stream5_global.cc b/tools/snort2lua/preprocessor_states/pps_stream5_global.cc
index 48b66d5b7..dbcda8c11 100644
--- a/tools/snort2lua/preprocessor_states/pps_stream5_global.cc
+++ b/tools/snort2lua/preprocessor_states/pps_stream5_global.cc
@@ -80,11 +80,8 @@ bool StreamGlobal::convert(std::istringstream& data_stream)
             tmpval = parse_deleted_option("track_ip", arg_stream);
 
         else if (keyword == "prune_log_max")
-        {
-            table_api.add_diff_option_comment("prune_log_max", "histogram");
-            if (!eat_option(arg_stream))
-                tmpval = false;
-        }
+            tmpval = parse_deleted_option("prune_log_max", arg_stream);
+
         else if (keyword == "max_tcp")
         {
             table_api.open_table("tcp_cache");