From d614b4f268ffb16085e1ec4f476b9418d40fdeb3 Mon Sep 17 00:00:00 2001 From: jmc <> Date: Mon, 6 Jun 2005 16:03:33 +0000 Subject: [PATCH] slight reshuffle to make this less confusing; ok beck@ --- src/etc/spamd.conf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/etc/spamd.conf b/src/etc/spamd.conf index b25995f3..b95ac0de 100644 --- a/src/etc/spamd.conf +++ b/src/etc/spamd.conf @@ -1,4 +1,4 @@ -# $OpenBSD: spamd.conf,v 1.14 2005/06/05 13:51:39 jmc Exp $ +# $OpenBSD: spamd.conf,v 1.15 2005/06/06 16:03:33 jmc Exp $ # # spamd config file, read by spamd-setup(8) for spamd(8) # @@ -66,14 +66,6 @@ korea:\ :method=http:\ :file=www.openbsd.org/spamd/koreacidr.txt.gz: -# Whitelists are done like this, and must be added to "all" after each -# blacklist from which you want the addresses in the whitelist removed. -# -#whitelist:\ -# :white:\ -# :method=file:\ -# :file=/var/mail/whitelist.txt: - #relaydb-black:\ # :black:\ # :msg="SPAM. Your address %A is in my relaydb list.":\ @@ -84,3 +76,11 @@ korea:\ # :white:\ # :method=exec:\ # :file=relaydb -4lw: + +# Whitelists are done like this, and must be added to "all" after each +# blacklist from which you want the addresses in the whitelist removed. +# +#whitelist:\ +# :white:\ +# :method=file:\ +# :file=/var/mail/whitelist.txt: