Add ftp-sesame ftp helper.

3 files changed, 15 insertions, 3 deletions

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index b401050..18d9fe2 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -832,4 +832,16 @@ EOD;
 	}
 }
 
+function system_start_ftp_helpers() {
+	global $config;
+	if(!$config['system']['disableftpproxy']) return;
+	if ($g['booting'])
+		echo "Starting INETD and FTP Helpers for FTP-PROXY...";
+	$wanif = get_real_wan_interface();
+	mwexec("/usr/sbin/inetd -wW -C 60");
+	mwexec("/usr/bin/killall ftpsesame 2>/dev/null");
+	mwexec("/usr/local/sbin/ftpsesame -i {$wanif} -q ftpproxy");
+}
+
+
 ?>
\ No newline at end of file
diff --git a/etc/rc b/etc/rc
index 4b7f025..d911779 100755
--- a/etc/rc
+++ b/etc/rc
@@ -67,9 +67,6 @@ cd /var/run && cp /dev/null utmp && chmod 644 utmp
 # let the PHP-based configuration subsystem set up the system now
 /etc/rc.bootup
 
-echo Starting INETD for FTP-PROXY...
-/usr/sbin/inetd -wW -C 60
-
 echo Starting Secure Shell Services...
 /etc/sshd
 
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 94928ac..fd8a064 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -161,6 +161,9 @@
 	/* run any shell commands specified in config.xml */
 	system_do_shell_commands();
 
+	/* start ftp proxy helpers if they are enabled */
+	system_start_ftp_helpers();	
+
 	/* done */
 	unlink("{$g['varrun_path']}/booting");
 ?>