summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCamiel Dobbelaar <camield@cvs.openbsd.org>2005-11-16 09:19:37 +0000
committerCamiel Dobbelaar <camield@cvs.openbsd.org>2005-11-16 09:19:37 +0000
commitfb75f23dc418aa5a72a24e6d7f5f1e5e6d2c8eba (patch)
treea0abfa2d80c6896f261ffa7b78f393cbf6be3294
parent3b8bc6f6511ce6032a5348f0daa8f0999b62c825 (diff)
add new ftp-proxy startup bits
ok henning beck
-rw-r--r--etc/rc6
-rw-r--r--etc/rc.conf3
2 files changed, 7 insertions, 2 deletions
diff --git a/etc/rc b/etc/rc
index b0fc8dcb551..443cde9bf72 100644
--- a/etc/rc
+++ b/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/etc/rc.conf b/etc/rc.conf
index ee574dbafdf..2f893628ab4 100644
--- a/etc/rc.conf
+++ b/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))