spam.m4: Rename X-SpamAssassin-* headers to X-Distorted-SpamAssassin-*.

[exim-config] / local.m4

diff --git a/local.m4 b/local.m4
index c403876b1aeddb8b0c0e4ae6f8181d70ec944f47..65939a2e50c9acebedf875ca349ddd4f838249a2 100644 (file)
--- a/local.m4
+++ b/local.m4
@@ -37,27 +37,6 @@ m4_define(<:FILTER_LOCALUSER:>,
 SECTION(global, priv)m4_dnl
 local_from_suffix = CONF_user_suffix_list
 
-SECTION(global, process)m4_dnl
-## Restrict users to plausible envelope sender addresses.  This is
-## surprisingly fiddly.  What I actually want to say is that the local part
-## must match ^$sender_ident(\$|-) and the domain part must match an
-## appropriate domain; but writing a conjunction is rather tricky.  And so we
-## must burn some addresslist variables.
-addresslist wrong_local = ! +user_extaddr
-addresslist wrong_domain = ! *@+public
-addresslist wrong_address = +wrong_local : +wrong_domain
-untrusted_set_sender = : \
-       ${if exists {CONF_sysconf_dir/auth-sender.conf} \
-            {${lookup {$sender_ident} \
-                      lsearch {CONF_sysconf_dir/auth-sender.conf} \
-                      {$value}}}} : \
-       ${LOOKUP_DOMAIN($sender_address_domain,
-               {${if and {{match_local_part {$sender_ident} {+dom_users}} \
-                          {match_local_part {$sender_address_local_part} \
-                                            {+dom_locals}}} \
-                     {*}}})} : \
-       ! +wrong_address
-
 ###--------------------------------------------------------------------------
 ### Forwarding and redirection for incoming mail.