DANE: Fix 2 messages from queue case

[exim.git] / test / confs / 4520

diff --git a/test/confs/4520 b/test/confs/4520
index 4497028553f605ef86b3107fb5348708e7a7be95..1f9d75b80773d38e29a8ff243aec3c15e793343e 100644 (file)
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -2,6 +2,7 @@
 
 SERVER=
 OPT=
 
 SERVER=
 OPT=

+FAKE =

 
 .include DIR/aux-var/std_conf_prefix
 
 
 .include DIR/aux-var/std_conf_prefix
 


@@ -9,22 +10,32 @@ primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

-acl_smtp_rcpt = accept
-acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
+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
+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
 
 
 # ----- 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:
 
 client:

-  driver = accept
-  transport = send_to_server
+  driver =     accept
+  transport =  send_to_server

 
 # ----- Transports
 
 
 # ----- Transports
 


@@ -35,6 +46,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

 
   dkim_domain =                test.ex
 .ifdef SELECTOR
 
   dkim_domain =                test.ex
 .ifdef SELECTOR


@@ -42,12 +54,31 @@ send_to_server:
 .else
   dkim_selector =      sel
 .endif
 .else
   dkim_selector =      sel
 .endif

-  dkim_private_key =   DIR/aux-fixed/dkim/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
 .ifndef HEADERS_MAXSIZE
   dkim_sign_headers =  OPT

+.else
+  dkim_identity =      allheaders@$dkim_domain

 .endif
 .ifdef VALUE
   dkim_hash =          VALUE
 .endif
 .endif
 .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/${bless:$local_part}
+  user =       CALLER

 
 # End
 
 # End