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

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

diff --git a/test/confs/0284 b/test/confs/0284
index a3bac7b5bcdfd427f5cd377b1239c77a973b279a..98f5660b7c05e14c77d92607323523b0a4749b12 100644 (file)
--- a/test/confs/0284
+++ b/test/confs/0284
@@ -1,14 +1,8 @@
 # Exim test configuration 0284
 
 # Exim test configuration 0284
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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


@@ -22,7 +16,9 @@ begin routers
 all:
   driver = accept
   address_data = ${if match{$local_part}{^(.)}{$1}}
 all:
   driver = accept
   address_data = ${if match{$local_part}{^(.)}{$1}}

-  transport = ${if match{$local_part}{^.*-(.*)\$}{$1}fail}
+  transport = ${if eq {${substr_-1_1:$local_part}}{1} {t1} \
+               {${if eq {${substr_-1_1:$local_part}}{2} {t2} \
+                 {${if eq {${substr_-1_1:$local_part}}{3} {t3} {t4}}}}}}

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


@@ -39,14 +35,14 @@ t1:
 t2:
   driver = appendfile
   batch_max = 100
 t2:
   driver = appendfile
   batch_max = 100

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

   envelope_to_add
   user = CALLER
 
 t3:
   driver = appendfile
   batch_max = 100
   envelope_to_add
   user = CALLER
 
 t3:
   driver = appendfile
   batch_max = 100

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

   envelope_to_add
   user = CALLER
 
   envelope_to_add
   user = CALLER