Merge branch 'qualys-2020'

[exim.git] / test / confs / 4520

diff --git a/test/confs/4520 b/test/confs/4520
index 1a8e34f9e13ade90287258226a5e9dbfc89bdc69..1ebd0817e6970403ca588bc2b7459b3365c35aa6 100644 (file)
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -10,15 +10,19 @@ primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
 
 # ----- 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_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
 
 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
 
 
 DDIR=DIR/aux-fixed/dkim
 

-log_selector = -dkim +dkim_verbose
+log_selector = -dkim +dkim_verbose +received_recipients

 
 # ----- Routers
 
 
 # ----- Routers
 


@@ -42,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


@@ -74,6 +79,7 @@ send_to_server:
 file:
   driver =     appendfile
   file =       DIR/test-mail/$local_part
 file:
   driver =     appendfile
   file =       DIR/test-mail/$local_part

+  create_file =        DIR/test-mail

   user =       CALLER
 
 # End
   user =       CALLER
 
 # End