From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Mon, 28 Nov 2016 15:37:29 +0000 (-0500)
Subject: Merge pull request #725 in SNORT/snort3 from modbus_duplicates to master
X-Git-Tag: 3.0.0-233~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a55b0e0b7da57cb027d42bab549d8547ffaa8771;p=thirdparty%2Fsnort3.git

Merge pull request #725 in SNORT/snort3 from modbus_duplicates to master

Squashed commit of the following:

commit 6f6e45378a305b45648ebcaf052660a9d7ad79b3
Author: allewi <allewi@cisco.com>
Date:   Sun Nov 27 13:27:40 2016 -0500

    adding change to prevent duplicate modbus configurations
---

diff --git a/tools/snort2lua/preprocessor_states/pps_modbus.cc b/tools/snort2lua/preprocessor_states/pps_modbus.cc
index 04a2769e7..44b78c67f 100644
--- a/tools/snort2lua/preprocessor_states/pps_modbus.cc
+++ b/tools/snort2lua/preprocessor_states/pps_modbus.cc
@@ -66,6 +66,8 @@ bool Modbus::convert(std::istringstream& data_stream)
     bind.set_when_proto("tcp");
     bind.set_use_type("modbus");
 
+    converted_args = true;
+
     table_api.open_table("modbus");
 
     // parse the file configuration
@@ -129,4 +131,3 @@ static const ConvertMap preprocessor_modbus =
 
 const ConvertMap* modbus_map = &preprocessor_modbus;
 }
-