Cutthrough: handle request when a callout-hold is active. Bug 2604

[exim.git] / test / confs / 0142

diff --git a/test/confs/0142 b/test/confs/0142
index 2e25d4438fcdc077a6cc065a2e58e2a8d39da33b..716ad5fa75d32a78deb79cb6c940361e307064bb 100644 (file)
--- a/test/confs/0142
+++ b/test/confs/0142
@@ -1,13 +1,7 @@
 # Exim test configuration 0142
 
 # Exim test configuration 0142
 

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

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


@@ -49,12 +43,12 @@ pipe:
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

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

   user = CALLER
 
 filtered_delivery:
   driver = appendfile
   user = CALLER
 
 filtered_delivery:
   driver = appendfile

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

   transport_filter = DIR/bin/fd -f
   user = CALLER
 
   transport_filter = DIR/bin/fd -f
   user = CALLER