- comment out relaydb entry, since it is not available by default

- add a `method' capability to the whitelist example

ok beck@

1 files changed, 11 insertions, 10 deletions

diff --git a/etc/spamd.conf b/etc/spamd.conf
index 41be5c219f8..b25995f30e0 100644
--- a/etc/spamd.conf
+++ b/etc/spamd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: spamd.conf,v 1.13 2005/05/11 20:27:58 jmc Exp $
+# $OpenBSD: spamd.conf,v 1.14 2005/06/05 13:51:39 jmc Exp $
 #
 # spamd config file, read by spamd-setup(8) for spamd(8)
 #
@@ -71,15 +71,16 @@ korea:\
 #
 #whitelist:\
 #	:white:\
+#	:method=file:\
 #	:file=/var/mail/whitelist.txt:
 
-relaydb-black:\
-	:black:\
-	:msg="SPAM. Your address %A is in my relaydb list.":\
-	:method=exec:\
-	:file=relaydb -4lb:
+#relaydb-black:\
+#	:black:\
+#	:msg="SPAM. Your address %A is in my relaydb list.":\
+#	:method=exec:\
+#	:file=relaydb -4lb:
 
-relaydb-white:\
-	:white:\
-	:method=exec:\
-	:file=relaydb -4lw:
+#relaydb-white:\
+#	:white:\
+#	:method=exec:\
+#	:file=relaydb -4lw: