From: Hui Cao (huica) <huica@cisco.com>
Date: Mon, 26 Feb 2018 16:27:53 +0000 (-0500)
Subject: Merge pull request #1115 in SNORT/snort3 from ftp_malware2 to master
X-Git-Tag: 3.0.0-244~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f16b901aa1f8fa833db99b59beee2005562c2671;p=thirdparty%2Fsnort3.git

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 b1f6aace0..b34d7c7c7 100644
--- 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;