===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc.conf,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- src/etc/rc.conf	2011/07/08 02:15:34	1.150
+++ src/etc/rc.conf	2011/07/08 04:54:12	1.151
@@ -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: ""
@@ -121,6 +121,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)}