From abfb2bcf1d62cfb0bc408c3f7ea23b42743cdd0e Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Fri, 26 Jul 2013 21:31:24 +0200 Subject: [PATCH] Preserve $local_part_suffix when forwarding to master --- modules/exim/templates/eximconf.erb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 63dfe797..a2cfefce 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -1438,9 +1438,16 @@ virt_users: transport_current_directory = ${extract{directory}{VDOMAINDATA}} user = ${extract{user}{VDOMAINDATA}} group = ${extract{group}{VDOMAINDATA}} + # Manually construct the forwarding address, preserving the + # local_part_suffix if the remote host is master. data = ${if exists{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}\ - {${lookup{$local_part}cdb\ - {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}} + {${local_part:${lookup{$local_part}cdb\ + {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}\ + ${if eq {${domain:${lookup{$local_part}cdb\ + {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}}{master.debian.org}{$local_part_suffix} {}}\ + @\ + ${domain:${lookup{$local_part}cdb\ + {${extract{directory}{VDOMAINDATA}{${value}/mail-forward.cdb}}}}}}} domains = +virtual_domains file_transport = address_file headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}" -- 2.39.2