base.m4, exchange.m4: Move TLS tweaks to `base.m4'.

[exim-config] / spam.m4

diff --git a/spam.m4 b/spam.m4
index 3e469bd..5d72365 100644 (file)
--- a/spam.m4
+++ b/spam.m4
@@ -43,7 +43,8 @@ fetch_spam_limit:
        check_local_user
        address_data = \
                ${if def:address_data {$address_data}{}} \
-               ${if exists {CONF_userconf_dir/spam-limit} \
+               ${if and {{!eq{$acl_c_mode}{submission}} \
+                         {exists {CONF_userconf_dir/spam-limit}}} \
                     {${lookup {$local_part_prefix\
                                        $local_part\
                                        $local_part_suffix\
@@ -55,7 +56,8 @@ fetch_spam_limit:
                                     {}}} \
                               {}}} \
                     {}} \
-               ${if exists {CONF_userconf_dir/spam-limit.userv} \
+               ${if and {{!eq{$acl_c_mode}{submission}} \
+                         {exists {CONF_userconf_dir/spam-limit.userv}}} \
                     {${run {timeout 5s -- \
                                userv $local_part exim-spam-limit \
                                        $sender_address \