From 250845dec301fb9a44f2c8c5f877bdb6bc9f7cb2 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Wed, 21 Nov 2007 23:17:32 +0000 Subject: Remove ftpproxy anchor that is not needed by ftp-proxy. Noticed-by: lsf --- etc/inc/config.inc | 2 +- etc/inc/filter.inc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'etc') diff --git a/etc/inc/config.inc b/etc/inc/config.inc index a5dfe8c..cb65b2b 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -1786,7 +1786,7 @@ function system_start_ftp_helpers() { /* if ftp-proxy is already running then do not launch it again */ $helpers = exec("/bin/ps awux | grep \"/usr/local/sbin/ftp-proxy {$shaper_queue} -p {$port}\" | grep -v grep | sed \"s/ */ /g\""); if(!$helpers && $ip) - mwexec("/usr/local/sbin/ftp-proxy {$shaper_queue} -p {$port} -P 8021 {$pftpxsourceaddr} {$ip}"); + mwexec("/usr/local/sbin/ftp-proxy {$shaper_queue} -p {$port} {$pftpxsourceaddr} {$ip}"); if(!$ip) mwexec("/usr/local/sbin/ftpsesame {$shaper_queue} -i $int"); $interface_counter++; diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 4ad1956..85d4732 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -2768,7 +2768,6 @@ EOD; $ipfrules .= "\n# SSH lockout\n"; $ipfrules .= "block in log proto tcp from to any port 22 label \"sshlockout\"\n\n"; - $ipfrules .= "anchor \"ftpproxy\"\n"; $ipfrules .= "anchor \"ftp-proxy/*\"\n"; $ipfrules .= process_carp_rules(); -- cgit v1.1