X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/33abb52060c6a939ea3f1f31b4b2fda21bdfc56a..45b7d61ea2adcc366813f5c72565da054158b5f2:/local.m4

diff --git a/local.m4 b/local.m4
index 65939a2..fd212a7 100644
--- a/local.m4
+++ b/local.m4
@@ -69,7 +69,7 @@ FILTER_ROUTER(dot_forward,
 
 SECTION(routers, deliver)m4_dnl
 ## Deliver mail to a user, in the absence of any other instructions.
-m4_define(<:STRIP_HEADERS:>, <:m4_dnl
+m4_define(<:DOVECOT_HEADERS:>, <:m4_dnl
 	Content-Length, Status, X-IMAP, X-IMAPbase, m4_dnl
 	X-Keywords, X-Status, X-UID:>)m4_dnl
 deliver:
@@ -79,10 +79,8 @@ deliver:
 	cannot_route_message = Unknown local part
 
 	## Strip headers used by Dovecot for its own purposes.
-	headers_remove = CLRSEP<::>FOREACH(<:SEP(:)$1:>, <:STRIP_HEADERS:>)
-	headers_add = CLRSEP<::>FOREACH(<:\
-		${if def:h_$1:{X-Distorted-Renamed-$1: $h_$1:\n}}:>,
-		<:STRIP_HEADERS:>)
+	headers_remove = RENAME_HEADERS_REMOVE(<:DOVECOT_HEADERS:>)
+	headers_add = RENAME_HEADERS_ADD(<:DOVECOT_HEADERS:>)
 
 DIVERT(null)
 ###----- That's all, folks --------------------------------------------------