From 366bd21d6530ddbf1b9671543185f3d2cd006238 Mon Sep 17 00:00:00 2001 From: "Adam D. Barratt" Date: Mon, 21 Oct 2019 22:45:14 +0100 Subject: [PATCH] eximconf: only treat @d.o addresses as eligible for default options Service domains have no way of opting out of the settings, so don't forcibly opt them in Signed-off-by: Adam D. Barratt --- modules/exim/templates/eximconf.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index be53a5489..400155485 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -307,7 +307,11 @@ GREYLIST_LOCAL_PARTS = ${if match_domain{$domain}{+virtual_domains}\ {${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/grey_users}}}{$local_part}{}}}{}}}\ {${lookup{$local_part}lsearch{/etc/exim4/grey_users}{$local_part}{}}}} : \ ${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-greylist}{$local_part}{}} -HAS_DEFAULT_OPTIONS = ${if eq{${lookup{$local_part}dbmnz{/var/lib/misc/$primary_hostname/default-mail-options.db}{$value}{TRUE}}}{TRUE}} +HAS_DEFAULT_OPTIONS = ${if and {\ + {eq{${lookup{$local_part}dbmnz{/var/lib/misc/$primary_hostname/default-mail-options.db}{$value}{TRUE}}}{TRUE}}\ + {exists{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.db}}}}\ + {! eq {${lookup{$local_part}dbmnz{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.db}}}}}{}}\ + }} <%- if @is_rtmaster -%> # This subject rewrite is embedded in double-quoted strings. As such, some of # the items need more escaping than usual, otherwise \N becomes simply "N" and -- 2.20.1