]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #692 in SNORT/snort3 from statics to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 4 Nov 2016 13:21:37 +0000 (09:21 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 4 Nov 2016 13:21:37 +0000 (09:21 -0400)
commitf6da3e0c3e92c8e23bab741a1080d892c372c92e
tree5e5bb76b004b04b70f0e091fdb78de10b57c8155
parent98981e0ffba5061bf1d3cb777ea0efa96c674235
Merge pull request #692 in SNORT/snort3 from statics to master

Squashed commit of the following:

commit 16bb37ec5884dce78e34640b69536e4e32d4a16b
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Nov 3 18:35:46 2016 -0400

    fix dynamic build for recent appid / http_inspect / sip changes

commit ba9d0ab0df042323ffb308b1a28088cc2acbfa50
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Nov 1 14:30:44 2016 -0400

    ensure static appid and http_inspect and their rule options are loaded
src/CMakeLists.txt
src/Makefile.am
src/network_inspectors/CMakeLists.txt
src/network_inspectors/network_inspectors.cc
src/service_inspectors/CMakeLists.txt
src/service_inspectors/imap/imap.cc
src/service_inspectors/pop/pop.cc
src/service_inspectors/service_inspectors.cc
src/service_inspectors/smtp/smtp.cc
src/service_inspectors/ssl/ssl_inspector.cc