diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2006-03-10 22:49:19 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2006-03-10 22:49:19 +0000 |
commit | f46fe44676c1b86037e937bf40d656e3ef1f200b (patch) | |
tree | 4bf7b3334d6db3a2d69d3cd8fa40b92d94e7c2e9 /etc | |
parent | f1140bf8c5cb9ead2216cedb21f86062acb58e9f (diff) | |
download | pfsense-f46fe44676c1b86037e937bf40d656e3ef1f200b.zip pfsense-f46fe44676c1b86037e937bf40d656e3ef1f200b.tar.gz |
Correctly check for ftp helper status on optional interfaces
Tested-by: databeestje
teehee
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/config.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index bb513b7..f48c0d8 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -1283,7 +1283,7 @@ function system_start_ftp_helpers() { /* build an array of interfaces to work with */ $iflist = array("lan" => "LAN"); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) - $iflist['opt' . $i] = $config['interfaces']['opt' . $i]['descr']; + $iflist['opt' . $i] = "opt{$i}"; /* loop through all interfaces and handle pftpx */ $interface_counter = 0; @@ -1294,12 +1294,12 @@ function system_start_ftp_helpers() { * here by not including -c {$port} -g 8021 first. */ $port = 8021 + $interface_counter; - if(isset($config['interfaces'][strtolower($ifname)]['disableftpproxy'])) { + if(isset($config['interfaces'][$ifname]['disableftpproxy'])) { /* item is disabled. lets ++ the interface counter and * keep processing interfaces. kill pftpx if already * running for this instance. */ - $helpers = exec("ps awux | grep \"/usr/local/sbin/pftpx -c {$port}\" | grep -v grep | sed \"s/ */ /g\" | cut -f2 -d\" \""); + $helpers = exec("/bin/ps awux | grep \"/usr/local/sbin/pftpx -c {$port}\" | grep -v grep | sed \"s/ */ /g\" | cut -f2 -d\" \""); if($helpers) mwexec("/bin/kill {$helpers}"); $interface_counter++; |