user-spam.m4: Fix indentation in the output.

[exim-config] / local.m4

diff --git a/local.m4 b/local.m4
index 65939a2e50c9acebedf875ca349ddd4f838249a2..fd212a7dba2d05262317868c784e9d8b4808a418 100644 (file)
--- 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 --------------------------------------------------