From 4fe57b9e2fb19b5203db127cb5fc7036df8128c3 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Wed, 25 Mar 1998 07:25:22 +0000
Subject: [PATCH] httpd is now in the tree, and an rc.conf flag turns it on

---
 src/etc/rc       | 6 +++++-
 src/etc/rc.conf  | 3 ++-
 src/etc/rc.local | 6 +-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index 17b93fef..a192fa96 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.68 1998/03/11 18:08:09 millert Exp $
+#	$OpenBSD: rc,v 1.69 1998/03/25 07:25:20 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -334,6 +334,10 @@ if [ "X${sendmail_flags}" != X"NO" -a -s /etc/sendmail.cf ]; then
 	echo -n ' sendmail';		/usr/sbin/sendmail ${sendmail_flags}
 fi
 
+if [ "X${httpd_flags}" != X"NO"  ]; then
+	echo -n ' httpd';		/usr/sbin/httpd ${httpd_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/src/etc/rc.conf b/src/etc/rc.conf
index b0056011..64bb95e1 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.16 1998/03/07 12:54:41 deraadt Exp $
+#	$OpenBSD: rc.conf,v 1.17 1998/03/25 07:25:21 deraadt Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for 'normal' use: routed_flags="-q"
@@ -14,6 +14,7 @@ named_flags=NO		# for 'normal' use: named_flags=""
 timed_flags=NO		# for 'normal' use: timed_flags=""
 photurisd_flags=NO	# for 'normal' use: photurisd_flags=""
 mopd_flags=NO		# for 'normal' use: mopd_flags="-a"
+httpd_flags=NO		# for 'normal' use: httpd_flags=""
 
 # set the following to "YES" to turn them on
 rwhod=NO
diff --git a/src/etc/rc.local b/src/etc/rc.local
index ed3c3afa..c062ce39 100644
--- a/src/etc/rc.local
+++ b/src/etc/rc.local
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.local,v 1.19 1998/02/02 00:29:14 dima Exp $
+#	$OpenBSD: rc.local,v 1.20 1998/03/25 07:25:22 deraadt Exp $
 
 # site-specific startup actions, daemons, and other things which
 # can be done AFTER your system goes into securemode.  For actions
@@ -10,10 +10,6 @@
 
 echo -n 'starting local daemons:'
 
-if [ -x /usr/local/etc/httpd/httpd ]; then
-	echo -n ' httpd';	/usr/local/etc/httpd/httpd
-fi
-
 if [ -x /usr/local/sbin/sshd ]; then
 	echo -n ' sshd';	/usr/local/sbin/sshd
 fi