Fix mismerge

[exim.git] / test / confs / 2202

diff --git a/test/confs/2202 b/test/confs/2202
index 64c638d9a9c34f64f829b7e0c1975e6e082a1ef3..7a1ddcbc85ea3295ee24faca2e89c79e1b121085 100644 (file)
--- a/test/confs/2202
+++ b/test/confs/2202
@@ -10,6 +10,10 @@ acl_smtp_vrfy = vrfy
 acl_smtp_rcpt = rcpt
 disable_ipv6
 
 acl_smtp_rcpt = rcpt
 disable_ipv6
 

+# need to use this sublist due to taint
+hostlist goodhosts = *.$sender_address_domain : $sender_address_domain : \
+                     ${lookup dnsdb{>:defer_never,mxh=$sender_address_domain}}
+

 .ifdef DNS_RECURSE
 hosts_treat_as_local =         test.again.dns
 domainlist try_again_dns_list =        @mx_any
 .ifdef DNS_RECURSE
 hosts_treat_as_local =         test.again.dns
 domainlist try_again_dns_list =        @mx_any


@@ -29,9 +33,6 @@ vrfy:
 .endif
 
 rcpt:
 .endif
 
 rcpt:

-  accept hosts = +ignore_unknown : \
-    *.$sender_address_domain : \
-    $sender_address_domain : \
-    ${lookup dnsdb{>:defer_never,mxh=$sender_address_domain}}
+  accept hosts = +ignore_unknown : +goodhosts

 
 # End
 
 # End