Use %ld not %l

[exim.git] / test / confs / 4520

diff --git a/test/confs/4520 b/test/confs/4520
index 3127d13b3dab1783eb3af66c155dcc62526b09ba..1ebd0817e6970403ca588bc2b7459b3365c35aa6 100644 (file)
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -10,27 +10,32 @@ primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
-acl_smtp_rcpt = accept logwrite = rcpt acl: macro: _DKIM_SIGN_HEADERS
+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
+acl_smtp_data = accept logwrite = data_acl: dkim status $dkim_verify_status
 
-dkim_verify_signers = $dkim_signers : FAKE
+dkim_verify_signers = $dkim_signers
+dkim_verify_min_keysizes = rsa=512 ed25519=250
+.ifdef FILTER
+dkim_verify_minimal = true
+.endif
 
 DDIR=DIR/aux-fixed/dkim
 
+log_selector = -dkim +dkim_verbose +received_recipients
 
 # ----- Routers
 
 begin routers
 
-server_dump:
-  driver = redirect
-  condition = ${if eq {SERVER}{server}{yes}{no}}
-  data = :blackhole:
+server_store:
+  driver =     accept
+  condition =  ${if eq {SERVER}{server}{yes}{no}}
+  transport =  file
 
 client:
-  driver = accept
-  transport = send_to_server
+  driver =     accept
+  transport =  send_to_server
 
 # ----- Transports
 
@@ -41,6 +46,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen = :
 
   dkim_domain =                test.ex
 .ifdef SELECTOR
@@ -49,9 +55,11 @@ send_to_server:
   dkim_selector =      sel
 .endif
 
-  dkim_private_key =   ${if match {$dkim_selector}{^ses}       {DDIR/dkim512.private} \
-                         {${if match {$dkim_selector}{^sel} {DDIR/dkim.private} \
-                         {}}}}
+  dkim_private_key =   ${extract {${length_3:$dkim_selector}} {\
+                               ses=dkim512.private \
+                               sel=dkim.private \
+                               sed=dkim_ed25519.private \
+                               }{DDIR/$value}}
 
 .ifndef HEADERS_MAXSIZE
   dkim_sign_headers =  OPT
@@ -61,5 +69,17 @@ send_to_server:
 .ifdef VALUE
   dkim_hash =          VALUE
 .endif
+.ifdef STRICT
+  dkim_strict =                STRICT
+.endif
+.ifdef TIMES
+  dkim_timestamps =    TIMES
+.endif
+
+file:
+  driver =     appendfile
+  file =       DIR/test-mail/$local_part
+  create_file =        DIR/test-mail
+  user =       CALLER
 
 # End