Fix taint trap in parse_fix_phrase(). Bug 2617

[exim.git] / test / confs / 4520

diff --git a/test/confs/4520 b/test/confs/4520
index 8332fa1d1e7a7b5c73eeb09698b96a21e2a8aa27..1f9d75b80773d38e29a8ff243aec3c15e793343e 100644 (file)
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -14,24 +14,28 @@ 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_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
+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
 
 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
 


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


@@ -67,5 +72,13 @@ send_to_server:
 .ifdef STRICT
   dkim_strict =                STRICT
 .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