diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2007-04-18 21:31:01 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2007-04-18 21:31:01 +0000 |
| commit | a72c07bcd4cc8e97524298e56b27fb42bde9abf2 (patch) | |
| tree | 985f3488bf6795c2cd836d3af4918d907480bde9 | |
| parent | 56dfb51e6c3d2c462ab6d35fc334b31a48b4b87c (diff) | |
| download | pfsense-a72c07bcd4cc8e97524298e56b27fb42bde9abf2.zip pfsense-a72c07bcd4cc8e97524298e56b27fb42bde9abf2.tar.gz | |
Do not echo out extra text when reloading the filter rules and correctly detect pftpx already started.
| -rw-r--r-- | etc/inc/filter.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 0d29325..8654440 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -929,10 +929,10 @@ function filter_nat_rules_generate() { */ $dontinstallrdr = false; if($target <> "") { + $external_address = $rule['external-address']; if($extport[0] == "21" and !isset($config['interfaces'][strtolower($rule['interface'])]['disableftpproxy'])) { - $helpers = exec("/bin/ps awux | grep {$target} -b {$external_address} | grep -v grep"); + $helpers = exec("/bin/ps awux | grep \"{$target} -b {$external_address}\" | grep -v grep"); if(!$helpers) { - $external_address = $rule['external-address']; if($external_address == "") $external_address = find_interface_ip(get_real_wan_interface()); /* install a pftpx helper, do not set a rule. also use the delay filter configure run |
