From 12d3b444e8703fb16cc4d8e9fe267d3d0aa11c6e Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 1 Jun 2015 02:24:55 +0100
Subject: [PATCH 1/1] base.m4: Allow arbitrary claimed envelope and header
 senders.

---
 base.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/base.m4 b/base.m4
index 22f6852..e7036c7 100644
--- 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
+untrusted_set_sender = *
 
 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}}
-		 control = submission
+		 control = submission/sender_retain
 
 	## Insist that a local client connect through TLS.
 	deny	 message = Hosts within CONF_master_domain must use TLS
-- 
2.11.0