From 325e364195812ad97e44d32e50b67958890740ac Mon Sep 17 00:00:00 2001
From: beck <>
Date: Tue, 27 Feb 2007 02:10:58 +0000
Subject: [PATCH] Flag day for spamd - 1) config files move to /etc/mail 2) -g
 option goes away in spamd-setup and spamd - greylisting is now the default 3)
 option change to spamd, -b addr becomes -l addr. 4) -b option in spamd-setup
 and spamd to turn on old blacklisting mode.

Man page shortly to be flensed to make this easier to explain
ok deraadt@ millert@
---
 src/etc/rc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index d4bda2a1..033bc77d 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.298 2007/02/02 14:51:19 ajacoutot Exp $
+#	$OpenBSD: rc,v 1.299 2007/02/27 02:10:58 beck Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -668,8 +668,8 @@ if [ X"${sshd_flags}" != X"NO" ]; then
 fi
 
 if [ X"${spamd_flags}" != X"NO" ]; then
-	if [ X"${spamd_grey}" != X"NO" ]; then
-		spamd_flags="${spamd_flags} -g"
+	if [ X"${spamd_grey}" = X"NO" ]; then
+		spamd_flags="${spamd_flags} -b"
 	fi
 	echo -n ' spamd';		eval /usr/libexec/spamd ${spamd_flags}
 	/usr/libexec/spamd-setup