diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-06-25 19:28:59 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-06-25 19:28:59 +0000 |
commit | dce949b0c047089fd4e195a6f13065f7a70996ab (patch) | |
tree | 4d29f793c9d43a9f1702bc73365b7a29f5f47b54 | |
parent | 25fc7786f53c4627fd15a3c077b00aa8e8dd87ce (diff) | |
download | pfsense-dce949b0c047089fd4e195a6f13065f7a70996ab.zip pfsense-dce949b0c047089fd4e195a6f13065f7a70996ab.tar.gz |
Let system_start_ftp_helpers() handle starting and stopping of pftpx
-rw-r--r-- | etc/inc/config.inc | 4 | ||||
-rwxr-xr-x | usr/local/www/system_advanced.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index d3db00b..d7ebd84 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -1036,8 +1036,10 @@ EOD; function system_start_ftp_helpers() { require_once("interfaces.inc"); global $config, $g; - if($config['system']['disableftpproxy'] <> "") + if($config['system']['disableftpproxy'] <> "") { + mwexec("/usr/bin/killall pftpx"); return; + } $wanip = get_current_wan_address(); mwexec("/usr/bin/killall pftpx"); if($wanip <> "" and $wanip <> "0.0.0.0") diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php index d0e5cb3..7708cbe 100755 --- a/usr/local/www/system_advanced.php +++ b/usr/local/www/system_advanced.php @@ -96,7 +96,7 @@ if ($_POST) { system_start_ftp_helpers(); } else { unset($config['system']['disableftpproxy']); - mwexec("/usr/bin/killall pftpx"); + system_start_ftp_helpers(); } if($_POST['rfc959workaround'] == "yes") $config['system']['rfc959workaround'] = "enabled"; |