Merge pull request #1115 in SNORT/snort3 from ftp_malware2 to master

Squashed commit of the following:

commit 0c1bdd2dc928df0777623a93027cf12fb4c3d84b
Author: Steve Chew <stechew@cisco.com>
Date:   Mon Feb 19 11:44:10 2018 -0500

    FtpInspector: Do not set flush flag after two packets.

diff --git a/src/service_inspectors/ftp_telnet/ftpdata_splitter.cc b/src/service_inspectors/ftp_telnet/ftpdata_splitter.cc
index b1f6aace07aa4c1b635ba26ee7d9c1cfde80aee3..b34d7c7c7c6fd464c0aefe66d5a7e0a8e5d421bd 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftpdata_splitter.cc
+++ b/src/service_inspectors/ftp_telnet/ftpdata_splitter.cc
@@ -59,7 +59,6 @@ StreamSplitter::Status FtpDataSplitter::scan(Flow* flow, const uint8_t*, uint32_
 
         if ( segs >= 2 && bytes >= min )
         {
-            set_ftp_flush_flag(flow);
             restart_scan();
             *fp = len;
             return FLUSH;