summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Downs <downsj@cvs.openbsd.org>1998-11-11 09:22:50 +0000
committerJason Downs <downsj@cvs.openbsd.org>1998-11-11 09:22:50 +0000
commit1fd6c74df02af9ffa624a7cea241e8474c66c4fe (patch)
tree4b5828373de5ba23ae940d2301cf3f4bba5c4132
parent43e84db7adee63859bd25952b428bbb51277ec55 (diff)
Add option for running ftpd out of rc.
-rw-r--r--etc/rc6
-rw-r--r--etc/rc.conf5
2 files changed, 9 insertions, 2 deletions
diff --git a/etc/rc b/etc/rc
index 596774106b7..fd5ffa74c04 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.92 1998/11/03 05:10:41 downsj Exp $
+# $OpenBSD: rc,v 1.93 1998/11/11 09:22:49 downsj Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -373,6 +373,10 @@ if [ "X${httpd_flags}" != X"NO" ]; then
echo -n ' httpd'; /usr/sbin/httpd ${httpd_flags}
fi
+if [ "X${ftpd_flags}" != X"NO" ]; then
+ echo -n ' ftpd'; /usr/libexec/ftpd ${ftpd_flags}
+fi
+
# $smtpfwdd_flags is imported from /etc/rc.conf;
# If $smtpfwdd_flags == NO, smtpfwdd isn't run.
if [ "X${smtpfwdd_flags}" != X"NO" ]; then
diff --git a/etc/rc.conf b/etc/rc.conf
index 4d24983c165..cbcecfbcdcf 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: rc.conf,v 1.32 1998/10/12 03:02:57 art Exp $
+# $OpenBSD: rc.conf,v 1.33 1998/11/11 09:22:49 downsj Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags
routed_flags=NO # for 'normal' use: routed_flags="-q"
@@ -18,6 +18,9 @@ httpd_flags=NO # for 'normal' use: httpd_flags=""
apmd_flags=NO # for 'normal' use: apmd_flags=""
dhcpd_flags=NO # for 'normal' use: dhcpd_flags="-q"
+# Set to NO if ftpd is running out of inetd
+ftpd_flags=NO # for non-inetd use: ftpd_flags="-D"
+
# On some architectures, you must also disable console getty in /etc/ttys
xdm_flags=NO # for 'normal' use: xdm_flags=""