From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Fri, 31 Aug 2018 19:22:55 +0000 (-0400)
Subject: Merge pull request #1346 in SNORT/snort3 from ftp_preproc_test_add to master
X-Git-Tag: 3.0.0-248~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf7ed10003a47584dac0bd8019cfbd3b03ef7edc;p=thirdparty%2Fsnort3.git

Merge pull request #1346 in SNORT/snort3 from ftp_preproc_test_add to master

Squashed commit of the following:

commit 46ab22195765465aea8564cfa111e62840c33bcb
Author: shaslad <shaslad@cisco.com>
Date:   Tue Aug 28 14:49:19 2018 -0400

    snort_defaults: changing default FTP EPSV string format
---

diff --git a/lua/snort_defaults.lua b/lua/snort_defaults.lua
index 0b9e44736..bb2e3d874 100644
--- a/lua/snort_defaults.lua
+++ b/lua/snort_defaults.lua
@@ -193,7 +193,7 @@ ftp_command_specs =
 
     { command = 'ALLO', length = 200, format = '< int [ char R int ] >' },
     { command = 'EPRT', length = 400, format = '< extd_host_port >' },
-    { command = 'EPSV', format = '< [ { char 12 | char A char L char L } ] >' },
+    { command = 'EPSV', format = "< [ { '1' | '2' | 'ALL' } ] >" },
     { command = 'LPRT', length = 400, format = '< long_host_port >' },
     { command = 'MACB', format = '< string >' },
     { command = 'MDTM', format = '< [ date nnnnnnnnnnnnnn[.n[n[n]]] ] string >' },