From 2b5c5bc6fbb755bf55a307a790497fff6da05475 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 27 Dec 2002 01:30:19 +0000
Subject: [PATCH] spamd startup stuff

---
 src/etc/crontab | 3 ++-
 src/etc/rc      | 7 ++++++-
 src/etc/rc.conf | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/etc/crontab b/src/etc/crontab
index eba918ef..9a4c7ba8 100644
--- a/src/etc/crontab
+++ b/src/etc/crontab
@@ -1,4 +1,4 @@
-#	$OpenBSD: crontab,v 1.10 2002/07/15 19:13:28 millert Exp $
+#	$OpenBSD: crontab,v 1.11 2002/12/27 01:30:19 deraadt Exp $
 #
 # /var/cron/tabs/root - root's crontab
 #
@@ -20,3 +20,4 @@ HOME=/var/log
 30	1	*	*	*	/bin/sh /etc/daily 2>&1 | tee /var/log/daily.out | mail -s "`/bin/hostname` daily output" root
 30	3	*	*	6	/bin/sh /etc/weekly 2>&1 | tee /var/log/weekly.out | mail -s "`/bin/hostname` weekly output" root
 30	5	1	*	*	/bin/sh /etc/monthly 2>&1 | tee /var/log/monthly.out | mail -s "`/bin/hostname` monthly output" root
+#*/4	*	*	*	*	/usr/libexec/spamd-setup -s
diff --git a/src/etc/rc b/src/etc/rc
index 27049225..55f08a28 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.211 2002/12/24 15:53:17 mcbride Exp $
+#	$OpenBSD: rc,v 1.212 2002/12/27 01:30:19 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -487,6 +487,11 @@ if [ "X${sendmail_flags}" != X"NO" -a -s /etc/mailer.conf ]; then
 	echo -n ' sendmail';		( /usr/sbin/sendmail ${sendmail_flags} >/dev/null 2>&1 & )
 fi
 
+if [ "X${spamd_flags}" != X"NO" ]; then
+	echo -n ' spamd';		/usr/libexec/spamd ${spamd_flags}
+	/usr/libexec/spamd-setup ${spamd_setup}
+fi
+
 if [ "X${httpd_flags}" != X"NO"  ]; then
 	# Clean up left-over httpd locks
 	rm -f /var/www/logs/{ssl_mutex,httpd.lock,accept.lock}.*
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 4900f8d8..e643a383 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.82 2002/12/03 19:15:06 miod Exp $
+#	$OpenBSD: rc.conf,v 1.83 2002/12/27 01:30:19 deraadt 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,8 @@ httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))
 
 # For normal use: "-L sm-mta -bd -q30m", and note there is a cron job
 sendmail_flags="-L sm-mta -C/etc/mail/localhost.cf -bd -q30m"
+spamd_flags=NO		# for normal use: "" and see spewd-setup(8)
+spamd_setup=		# for normal use: -1 or other such options
 
 # Set to NO if ftpd is running out of inetd
 ftpd_flags=NO		# for non-inetd use: "-D"