From 6706c7e152e98b3fd221e67634183c9ca3f09303 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Thu, 26 Feb 2004 07:33:08 +0000
Subject: [PATCH] add support for spamd greylisting with spamd -g and spamlogd
 to rc/rc.conf

---
 src/etc/rc      | 9 ++++++++-
 src/etc/rc.conf | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index 0b024234..b880027f 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.234 2004/02/25 08:42:38 jmc Exp $
+#	$OpenBSD: rc,v 1.235 2004/02/26 07:33:08 beck Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -498,8 +498,15 @@ if [ "X${sendmail_flags}" != X"NO" -a -s /etc/mailer.conf ]; then
 fi
 
 if [ "X${spamd_flags}" != X"NO" ]; then
+	if [ "X${spamd_grey}" != X"NO" ]; then
+		spamd_flags="${spamd_flags} -g"
+	fi
 	echo -n ' spamd';		/usr/libexec/spamd ${spamd_flags}
 	/usr/libexec/spamd-setup
+	if [ "X${spamd_grey}" != X"NO" ]; then
+		echo -n ' spamlogd'
+		/usr/libexec/spamlogd
+	fi
 fi
 
 if [ "X${httpd_flags}" != X"NO"  ]; then
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index f87d854f..8a406d9c 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.93 2004/02/11 23:17:33 beck Exp $
+#	$OpenBSD: rc.conf,v 1.94 2004/02/26 07:33:08 beck Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -34,6 +34,7 @@ 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_grey=NO		# use spamd greylisting if YES
 
 # Set to NO if ftpd is running out of inetd
 ftpd_flags=NO		# for non-inetd use: "-D"