]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #725 in SNORT/snort3 from modbus_duplicates to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Mon, 28 Nov 2016 15:37:29 +0000 (10:37 -0500)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Mon, 28 Nov 2016 15:37:29 +0000 (10:37 -0500)
commita55b0e0b7da57cb027d42bab549d8547ffaa8771
tree4c5d673f5d8639bdd77b7b8097c703f24c56ca11
parent91a996fd87bad74eae02ef6e0e5f2cc9b3df7a9f
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
tools/snort2lua/preprocessor_states/pps_modbus.cc