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

[exim.git] / test / confs / 0274

diff --git a/test/confs/0274 b/test/confs/0274
index ab98f68dd4c98fff159da1c72df86429b2307cd7..461acfcf33cc60b2d87a6d1fcb8de8c688d7dd0a 100644 (file)
--- a/test/confs/0274
+++ b/test/confs/0274
@@ -1,14 +1,8 @@
 # Exim test configuration 0274
 
 # Exim test configuration 0274
 

-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 -----
 


@@ -20,7 +14,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

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

   user = CALLER
 
 # ----- Routers -----
   user = CALLER
 
 # ----- Routers -----