summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2007-11-21 23:17:32 +0000
committerScott Ullrich <sullrich@pfsense.org>2007-11-21 23:17:32 +0000
commit250845dec301fb9a44f2c8c5f877bdb6bc9f7cb2 (patch)
tree5d8d92589ec09dd98aeb3f896270905f37af45d0 /etc
parent68bf32daaf62dc1a09588d5c5fb98f78d507a04f (diff)
downloadpfsense-250845dec301fb9a44f2c8c5f877bdb6bc9f7cb2.zip
pfsense-250845dec301fb9a44f2c8c5f877bdb6bc9f7cb2.tar.gz
Remove ftpproxy anchor that is not needed by ftp-proxy.
Noticed-by: lsf
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/config.inc2
-rw-r--r--etc/inc/filter.inc1
2 files changed, 1 insertions, 2 deletions
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 <sshlockout> to any port 22 label \"sshlockout\"\n\n";
- $ipfrules .= "anchor \"ftpproxy\"\n";
$ipfrules .= "anchor \"ftp-proxy/*\"\n";
$ipfrules .= process_carp_rules();
OpenPOWER on IntegriCloud