Merge branch 'master' into 4.next

[exim.git] / test / confs / 2200

diff --git a/test/confs/2200 b/test/confs/2200
index 65919ba8ea945febfd7272ef83e6dfad95bac8a1..73f6f48e7a6e4d59a96b6f03c5843eae9c2832ee 100644 (file)
--- a/test/confs/2200
+++ b/test/confs/2200
@@ -1,24 +1,24 @@
 # Exim test configuration 2200
 # Check for dnsdb cache TTL handling
 
 # Exim test configuration 2200
 # Check for dnsdb cache TTL handling
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

-acl_not_smtp = check_rcpt
+acl_smtp_rcpt = check_rcpt
+acl_not_smtp = check_not_smtp

 queue_only
 
 begin acl
 
 check_rcpt:
 queue_only
 
 begin acl
 
 check_rcpt:

+  accept
+       local_parts =   defer_strict
+       set acl_m1 =    ${lookup dnsdb{defer_strict,a=$domain}}
+
+check_not_smtp:

   warn
        set acl_m1 =    ${map {<,$recipients} \
                                {${lookup dnsdb{a=${domain:$item}}{$value}fail}}}
   warn
        set acl_m1 =    ${map {<,$recipients} \
                                {${lookup dnsdb{a=${domain:$item}}{$value}fail}}}