From 0cf65a8865b70976c5f1be158518e794036646a9 Mon Sep 17 00:00:00 2001 From: "Adam D. Barratt" Date: Fri, 11 Oct 2019 17:52:00 +0100 Subject: [PATCH] eximconf: remove "temporary weasel hack" The affected tickets have been closed since 2012, so that's probably been temporary enough now. :) Signed-off-by: Adam D. Barratt --- modules/exim/templates/eximconf.erb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 2fa12c9f4..9d9352d52 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -773,10 +773,7 @@ check_recipient: <%- end -%> <%- if @is_rtmaster -%> warn condition = ${if eq{$acl_m_prf}{RTMail}} - set acl_m12 = ${if def:acl_m12 {$acl_m12} {${if or{{match{$local_part}{\N[^+]+\+\d+\N}}{match{$local_part}{\N[^+]+\+new\N}}{match{$local_part}{3520}}{match{$local_part}{3645}}} {RTMailRecipientHasSubaddress}}}} - # temporary hack because weasel screwed up and gave people an rt-3520@ address, which doesn't really work normally. and rt-3645 - #set acl_m12 = ${if def:acl_m12 {$acl_m12} {${if or{{match{$local_part}{\N[^+]+\+\d+\N}}{match{$local_part}{\N[^+]+\+new\N}}} {RTMailRecipientHasSubaddress}}}} - + set acl_m12 = ${if def:acl_m12 {$acl_m12} {${if or{{match{$local_part}{\N[^+]+\+\d+\N}}{match{$local_part}{\N[^+]+\+new\N}}} {RTMailRecipientHasSubaddress}}}} <%- end -%> <%- if has_variable?("greylistd") && @greylistd -%> -- 2.20.1