From 614e35d3658c70877d187b0ab02f0122f6ede099 Mon Sep 17 00:00:00 2001
From: camield <>
Date: Wed, 16 Nov 2005 09:19:36 +0000
Subject: [PATCH] add new ftp-proxy startup bits

ok henning beck
---
 src/etc/rc      | 6 +++++-
 src/etc/rc.conf | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index b0fc8dcb..443cde9b 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.274 2005/10/31 10:32:47 henning Exp $
+#	$OpenBSD: rc,v 1.275 2005/11/16 09:19:36 camield Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -635,6 +635,10 @@ if [ X"${ftpd_flags}" != X"NO" ]; then
 	echo -n ' ftpd';		/usr/libexec/ftpd ${ftpd_flags}
 fi
 
+if [ X"${ftpproxy_flags}" != X"NO" ]; then
+	echo -n ' ftp-proxy';		/usr/sbin/ftp-proxy ${ftpproxy_flags}
+fi
+
 if [ X"${identd_flags}" != X"NO" ]; then
 	echo -n ' identd';		/usr/libexec/identd ${identd_flags}
 fi
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index ee574dba..2f893628 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.108 2005/11/01 20:32:42 deraadt Exp $
+#	$OpenBSD: rc.conf,v 1.109 2005/11/16 09:19:36 camield Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -32,6 +32,7 @@ lpd_flags=NO		# for normal use: "" (or "-l" for debugging)
 sensorsd_flags=NO	# for normal use: ""
 hotplugd_flags=NO	# for normal use: ""
 watchdogd_flags=NO	# for normal use: ""
+ftpproxy_flags=NO	# for normal use: ""
 
 # use -u to disable chroot, see httpd(8)
 httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))