From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Tue, 15 Oct 2019 19:29:22 +0000 (-0400)
Subject: Merge pull request #1800 in SNORT/snort3 from ~NIHDESAI/snort3:ftp_warn to master
X-Git-Tag: 3.0.0-263~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e4e799dfde171c5ac92362ab0e8159568eb6dff;p=thirdparty%2Fsnort3.git

Merge pull request #1800 in SNORT/snort3 from ~NIHDESAI/snort3:ftp_warn to master

Squashed commit of the following:

commit 450926ec637f648f53a007f0dd92e2c940cf702b
Author: Nihal Desai <nihdesai@cisco.com>
Date:   Tue Oct 15 02:15:08 2019 -0400

    ftp: fix for missing prototype warning
---

diff --git a/src/service_inspectors/ftp_telnet/ftp_module.cc b/src/service_inspectors/ftp_telnet/ftp_module.cc
index 65e47f997..5211ea243 100644
--- a/src/service_inspectors/ftp_telnet/ftp_module.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_module.cc
@@ -493,7 +493,7 @@ static void ResetStringFormat(FTP_PARAM_FMT* Fmt)
     ResetStringFormat(Fmt->next_param_fmt);
 }
 
-int ProcessFTPDataChanCmdsList(
+static int ProcessFTPDataChanCmdsList(
     FTP_SERVER_PROTO_CONF* ServerConf, const FtpCmd* fc)
 {
     const char* cmd = fc->name.c_str();