summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-06-13 01:13:58 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-06-13 01:13:58 +0000
commit8cac5101cc046ca1dac4778b1feef16b350796ab (patch)
tree2768474f033559e57ce8bd0c5e708be2cf9c9bf9
parentc163a8483bc0bfd14660b20191341c006f1a58a3 (diff)
downloadpfsense-8cac5101cc046ca1dac4778b1feef16b350796ab.zip
pfsense-8cac5101cc046ca1dac4778b1feef16b350796ab.tar.gz
Correctly start pftp on pppoe and similar type connections
-rw-r--r--etc/inc/config.inc12
1 files changed, 7 insertions, 5 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 0c3c892..8cdb854 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -1016,11 +1016,13 @@ EOD;
function system_start_ftp_helpers() {
global $config, $g;
- if($config['system']['disableftpproxy'] <> "") return;
- $wanif = get_real_wan_interface();
- $ip = find_interface_ip($wanif);
- mwexec("/sbin/killall pftpx");
- mwexec("/usr/local/sbin/pftpx -g 8021 -p {$ip}");
+ if($config['system']['disableftpproxy'] <> "")
+ return;
+ $wanip = get_current_wan_address();
+ mwexec("/usr/bin/killall pftpx");
+ if($wanip <> "" and $wanip <> "0.0.0.0")
+ $pip = "-p {$ip}";
+ mwexec("/usr/local/sbin/pftpx -g 8021 {$pip}");
}
function cleanup_backupcache($revisions = 30) {
OpenPOWER on IntegriCloud