From a9919c5284c683fd8914f856e4ed600570466978 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Mon, 10 Mar 2003 01:05:28 +0000
Subject: [PATCH] commented hourly spamd-setup run

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

diff --git a/src/etc/crontab b/src/etc/crontab
index 9a4c7ba8..e4d0e576 100644
--- a/src/etc/crontab
+++ b/src/etc/crontab
@@ -1,4 +1,4 @@
-#	$OpenBSD: crontab,v 1.11 2002/12/27 01:30:19 deraadt Exp $
+#	$OpenBSD: crontab,v 1.12 2003/03/10 01:05:28 deraadt Exp $
 #
 # /var/cron/tabs/root - root's crontab
 #
@@ -20,4 +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
+#0	*	*	*	*	/usr/libexec/spamd-setup
diff --git a/src/etc/rc b/src/etc/rc
index c77a6d86..8ccd5377 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.221 2003/03/04 23:37:15 jakob Exp $
+#	$OpenBSD: rc,v 1.222 2003/03/10 01:05:28 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -500,7 +500,7 @@ fi
 
 if [ "X${spamd_flags}" != X"NO" ]; then
 	echo -n ' spamd';		/usr/libexec/spamd ${spamd_flags}
-	/usr/libexec/spamd-setup ${spamd_setup}
+	/usr/libexec/spamd-setup
 fi
 
 if [ "X${httpd_flags}" != X"NO"  ]; then
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index b84df313..8414002c 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.85 2003/03/04 22:45:53 jakob Exp $
+#	$OpenBSD: rc.conf,v 1.86 2003/03/10 01:05:28 deraadt Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -33,7 +33,6 @@ 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 spamd-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"