DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 2202

diff --git a/test/confs/2202 b/test/confs/2202
index 825be913e7069f5f3989010058ba50ba464ad465..7a1ddcbc85ea3295ee24faca2e89c79e1b121085 100644 (file)
--- a/test/confs/2202
+++ b/test/confs/2202
@@ -1,25 +1,38 @@
 # Exim test configuration 2202
 
 # Exim test configuration 2202
 

-CONNECTCOND=
-

 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

+acl_smtp_vrfy = vrfy

 acl_smtp_rcpt = rcpt
 acl_smtp_rcpt = rcpt

-dns_again_means_nonexist = *

 disable_ipv6
 
 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
+dns_again_means_nonexist =     !+try_again_dns_list
+# that last line tries to set up a recursion
+.else
+dns_again_means_nonexist =     *
+.endif
+

 # ----- ACL -----
 
 begin acl
 
 # ----- ACL -----
 
 begin acl
 

+vrfy:
+.ifdef DNS_RECURSE
+  warn domains = +try_again_dns_list
+.endif
+

 rcpt:
 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