satellite.m4: Apply `/etc/aliases' to master-domain-qualified addresses.

[exim-config] / spam.m4

diff --git a/spam.m4 b/spam.m4
index 7ed0f04..4570210 100644 (file)
--- a/spam.m4
+++ b/spam.m4
@@ -59,7 +59,7 @@ m4_define(<:SPAMLIMIT_LOOKUP:>,
 
 m4_define(<:SPAMLIMIT_USERV:>,
        <:SPAMLIMIT_SET(<:${run {/usr/bin/timeout 5s \
-                                       userv CONF_userv_opts \
+                                       /usr/bin/userv CONF_userv_opts \
                                        SHQUOTE($1) exim-spam-limit \
                                        SHQUOTE($4) \
                                        SHQUOTE($2) SHQUOTE(@$3)} \
@@ -81,7 +81,7 @@ skip_spam_check:
        ## If the client is trusted, or this is a new submission, don't
        ## bother with any of this.  We will have verified the sender
        ## fairly aggressively before granting this level of trust.
-       accept   hosts = +trusted
+       accept   hosts = CONF_relay_clients
        accept   condition = ${if eq{$acl_c_mode}{submission}}
 
        ## If all domains have disabled spam checking then don't check.
@@ -146,7 +146,7 @@ rcpt_spam:
        ## All done.
        accept
 
-SECTION(acl, data-spam)m4_dnl
+SECTION(acl, data-hooks)m4_dnl
        ## Do spam checking.
        require  acl = data_spam