SECTION(global, policy)m4_dnl
spamd_address = CONF_spamd_address CONF_spamd_port
-SECTION(routers, allspam)m4_dnl
-## If we're verifying an address and the recipient has a `~/.mail/spam-limit'
-## file, then look up the recipient and sender addresses to find a plausible
-## limit and insert it into the `address_data' where the RCPT ACL can find
-## it. This router always declines, so it doesn't affect the overall outcome
-## of the verification.
-SPAMLIMIT_ROUTER(fetch_spam_limit_lookup)
- check_local_user
- local_part_suffix = CONF_user_suffix_list
- local_part_suffix_optional = true
- SPAMLIMIT_LOOKUP(CONF_userconf_dir/spam-limit,
- $local_part_prefix, $local_part, $local_part_suffix, $domain,
- $sender_address)
-
-SPAMLIMIT_ROUTER(fetch_spam_limit_userv)
- check_local_user
- local_part_suffix = CONF_user_suffix_list
- local_part_suffix_optional = true
- condition = ${if exists{CONF_userconf_dir/spam-limit.userv}}
- SPAMLIMIT_USERV(SHQUOTE($local_part),
- $local_part_prefix, $local_part, $local_part_suffix, $domain,
- $sender_address)
-
SECTION(acl, rcpt-hooks)m4_dnl
## Do per-recipient spam-filter processing.
require acl = rcpt_spam
--- /dev/null
+### -*-m4-*-
+###
+### User-configurable spam filtering for distorted.org.uk Exim configuration
+###
+### (c) 2012 Mark Wooding
+###
+
+###----- Licensing notice ---------------------------------------------------
+###
+### This program is free software; you can redistribute it and/or modify
+### it under the terms of the GNU General Public License as published by
+### the Free Software Foundation; either version 2 of the License, or
+### (at your option) any later version.
+###
+### This program is distributed in the hope that it will be useful,
+### but WITHOUT ANY WARRANTY; without even the implied warranty of
+### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+### GNU General Public License for more details.
+###
+### You should have received a copy of the GNU General Public License
+### along with this program; if not, write to the Free Software Foundation,
+### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+DIVERT(null)
+###--------------------------------------------------------------------------
+### User-configurable spam thresholds.
+
+SECTION(routers, allspam)m4_dnl
+## If we're verifying an address and the recipient has a `~/.mail/spam-limit'
+## file, then look up the recipient and sender addresses to find a plausible
+## limit and insert it into the `address_data' where the RCPT ACL can find
+## it. This router always declines, so it doesn't affect the overall outcome
+## of the verification.
+SPAMLIMIT_ROUTER(fetch_spam_limit_lookup)
+ check_local_user
+ local_part_suffix = CONF_user_suffix_list
+ local_part_suffix_optional = true
+ SPAMLIMIT_LOOKUP(CONF_userconf_dir/spam-limit,
+ $local_part_prefix, $local_part, $local_part_suffix, $domain,
+ $sender_address)
+
+SPAMLIMIT_ROUTER(fetch_spam_limit_userv)
+ check_local_user
+ local_part_suffix = CONF_user_suffix_list
+ local_part_suffix_optional = true
+ condition = ${if exists{CONF_userconf_dir/spam-limit.userv}}
+ SPAMLIMIT_USERV(SHQUOTE($local_part),
+ $local_part_prefix, $local_part, $local_part_suffix, $domain,
+ $sender_address)
+
+DIVERT(null)
+###----- That's all, folks --------------------------------------------------