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

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

diff --git a/test/confs/0022 b/test/confs/0022
index 2ec64d848e9dac678d5504cf505acf211b3c356e..2228b280714f53ab8317ba0ca63b23112898ca32 100644 (file)
--- a/test/confs/0022
+++ b/test/confs/0022
@@ -2,14 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

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

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

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -66,7 +61,8 @@ delay_warn:
   accept
 
 freeze:
   accept
 
 freeze:

-  accept   control = freeze
+  accept   logwrite = Connections=$smtp_count_at_connection_start
+           control = freeze

 
 queue_only:
   accept   control = queue_only
 
 queue_only:
   accept   control = queue_only


@@ -94,7 +90,7 @@ begin transports
 
 appendfile:
   driver = appendfile
 
 appendfile:
   driver = appendfile

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

   user = CALLER
 
 # End
   user = CALLER
 
 # End