Taint: fix multiple ACL actions to properly manage tainted argument data

[users/jgh/exim.git] / test / confs / 0137

diff --git a/test/confs/0137 b/test/confs/0137
index 45f3c442ac0f889e62f4bd9613f3aa007fa5617b..faab263aacb545690cb5a75e81aa63e370e0a6df 100644 (file)
--- a/test/confs/0137
+++ b/test/confs/0137
@@ -1,16 +1,14 @@
 # Exim test configuration 0137
 
 # Exim test configuration 0137
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

+log_selector = +subject

 domainlist local_domains = test.ex
 qualify_domain = test.ex
 domainlist local_domains = test.ex
 qualify_domain = test.ex

+untrusted_set_sender = *

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


@@ -20,7 +18,10 @@ begin routers
 smart:
   driver = accept
   retry_use_local_part
 smart:
   driver = accept
   retry_use_local_part

-  transport = $h_transport:
+  transport = ${if eq {t1}{$sender_address_local_part} {local_delivery} \
+               {${if eq {t2}{$sender_address_local_part} {local_delivery_fcntl} \
+               {${if eq {t3}{$sender_address_local_part} {local_delivery_fcntl_blocking} \
+               {} }}}}}

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


@@ -29,14 +30,14 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

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

   lock_interval = 1s
   lock_retries = 2
   user = CALLER
 
 local_delivery_fcntl:
   driver = appendfile
   lock_interval = 1s
   lock_retries = 2
   user = CALLER
 
 local_delivery_fcntl:
   driver = appendfile

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

   lock_interval = 1s
   lock_retries = 2
   no_use_lockfile
   lock_interval = 1s
   lock_retries = 2
   no_use_lockfile


@@ -44,7 +45,7 @@ local_delivery_fcntl:
 
 local_delivery_fcntl_blocking:
   driver = appendfile
 
 local_delivery_fcntl_blocking:
   driver = appendfile

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

   lock_fcntl_timeout = 2s
   lock_interval = 1s
   lock_retries = 2
   lock_fcntl_timeout = 2s
   lock_interval = 1s
   lock_retries = 2