Taint: fix hybrid-mode transition

[exim.git] / test / confs / 4520

diff --git a/test/confs/4520 b/test/confs/4520
index 3b8d781eae3fe3c9cabbccd3e88a9492bd8ec941..770d8cc62d8d9a4edf32edefbb66502624846425 100644 (file)
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -14,11 +14,14 @@ acl_smtp_rcpt = accept logwrite = rcpt acl: macro: _DKIM_SIGN_HEADERS
 acl_smtp_dkim = accept logwrite = dkim_acl: signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
 acl_smtp_data = accept logwrite = data acl: dkim status $dkim_verify_status
 
-dkim_verify_signers = $dkim_signers : FAKE
+dkim_verify_signers = $dkim_signers
+.ifdef FILTER
+dkim_verify_minimal = true
+.endif
 
 DDIR=DIR/aux-fixed/dkim
 
-log_selector = -dkim +dkim_verbose
+log_selector = -dkim +dkim_verbose +received_recipients
 
 # ----- Routers
 
@@ -42,6 +45,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen = :
 
   dkim_domain =                test.ex
 .ifdef SELECTOR
@@ -67,10 +71,13 @@ send_to_server:
 .ifdef STRICT
   dkim_strict =                STRICT
 .endif
+.ifdef TIMES
+  dkim_timestamps =    TIMES
+.endif
 
 file:
   driver =     appendfile
-  file =       DIR/test-mail/$local_part
+  file =       DIR/test-mail/${bless:$local_part}
   user =       CALLER
 
 # End