base.m4: Allow arbitrary claimed envelope and header senders.

diff --git a/base.m4 b/base.m4
index 22f6852b65c64f11e530bf470d3c172b70341d75..e7036c7ffb56bae559158f9065134837ca86cf7a 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -85,6 +85,7 @@ SECTION(global, process)m4_dnl
 extract_addresses_remove_arguments = false
 headers_charset = utf-8
 qualify_domain = CONF_master_domain
 extract_addresses_remove_arguments = false
 headers_charset = utf-8
 qualify_domain = CONF_master_domain

+untrusted_set_sender = *

 
 SECTION(global, bounce)m4_dnl
 delay_warning = 1h : 24h : 2d
 
 SECTION(global, bounce)m4_dnl
 delay_warning = 1h : 24h : 2d


@@ -167,7 +168,7 @@ mail:
 
        ## If this is directly from a client then hack on it for a while.
        warn     condition = ${if eq{$acl_c_mode}{submission}}
 
        ## If this is directly from a client then hack on it for a while.
        warn     condition = ${if eq{$acl_c_mode}{submission}}

-                control = submission
+                control = submission/sender_retain

 
        ## Insist that a local client connect through TLS.
        deny     message = Hosts within CONF_master_domain must use TLS
 
        ## Insist that a local client connect through TLS.
        deny     message = Hosts within CONF_master_domain must use TLS