From 1593f7f2a842595499bd9fbefb6d13b2d2f68748 Mon Sep 17 00:00:00 2001
From: robert <>
Date: Fri, 8 Jul 2011 04:54:12 +0000
Subject: [PATCH] fix boot output and make sure spamlogd is only started when
 needed

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

diff --git a/src/etc/rc b/src/etc/rc
index 57be2728..56150197 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.377 2011/07/08 02:15:34 robert Exp $
+#	$OpenBSD: rc,v 1.378 2011/07/08 04:54:12 robert Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -414,9 +414,8 @@ dmesg >/var/run/dmesg.boot
 
 make_keys
 
-echo -n 'starting system logger: '
+echo -n 'starting system logger:'
 start_daemon syslogd
-echo '.'
 
 if [ X"${pf}" != X"NO" ]; then
 	ifconfig pflog0 create >/dev/null 2>&1
@@ -426,6 +425,8 @@ if [ X"${pf}" != X"NO" ]; then
 	fi
 fi
 
+echo '.'
+
 echo -n 'starting name service daemons:'
 start_daemon named nsd
 echo '.'
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index eeb41397..25364feb 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.150 2011/07/08 02:15:34 robert Exp $
+#	$OpenBSD: rc.conf,v 1.151 2011/07/08 04:54:12 robert Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 ldpd_flags=NO		# for normal use: ""
@@ -122,6 +122,12 @@ unset statd_flags
 
 [ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line
 
+# special care needed for spamlogd to avoid starting it up and failing
+# all the time
+if [  X"${spamd_flags}" = X"NO" -o X"${spamd_black}" != X"NO" ]; then
+	spamlogd_flags=NO
+fi
+
 # backward compatibility
 : ${inetd_flags=$([ X"${inetd-YES}" = XYES ] || echo NO)}
 : ${rwhod_flags=$([ X"${rwhod-NO}" = XYES ] || echo NO)}