Taint: fix ACL "spam" condition, to permit tainted name arguments.

[users/heiko/exim.git] / test / confs / 0618

diff --git a/test/confs/0618 b/test/confs/0618
index 2a2d8a97dda96a4a6427b6de15d106f5b48b5238..d212e98757d6c0d321ee5ce61eb03a18304dc4c8 100644 (file)
--- a/test/confs/0618
+++ b/test/confs/0618
@@ -11,7 +11,7 @@ primary_hostname = myhost.test.ex
 .ifdef OPT
 dsn_advertise_hosts = *
 .endif
 .ifdef OPT
 dsn_advertise_hosts = *
 .endif

-delay_warning = 3s : 24h
+delay_warning = 6s : 24h

 
 accept_8bitmime = false
 pipelining_advertise_hosts = :
 
 accept_8bitmime = false
 pipelining_advertise_hosts = :


@@ -44,6 +44,11 @@ rcpt:
 
 begin routers
 
 
 begin routers
 

+r_dump:
+  driver =     redirect
+  domains =    dump.ex
+  data =       :blackhole:
+

 r1:
   driver =     accept
   condition =  ${if eq {127.0.0.1}{$sender_host_address}}
 r1:
   driver =     accept
   condition =  ${if eq {127.0.0.1}{$sender_host_address}}


@@ -70,6 +75,7 @@ begin transports
 smtp:
   driver =     smtp
   event_action = ${acl {ev_log}}
 smtp:
   driver =     smtp
   event_action = ${acl {ev_log}}

+  hosts_try_fastopen = :

 
 bad_tpt:
   driver =     smtp
 
 bad_tpt:
   driver =     smtp


@@ -78,11 +84,11 @@ bad_tpt:
 
 tofile:
   driver = appendfile
 
 tofile:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
   event_action = ${acl {ev_log}}
 
 begin retry
 
   user = CALLER
   event_action = ${acl {ev_log}}
 
 begin retry
 

-*      *       F,1m,3s
+*      *       F,2m,10s

 # End
 # End