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

[exim.git] / test / confs / 5101

diff --git a/test/confs/5101 b/test/confs/5101
index 20b3dbb27db1c98239eb861e8fc1c460bc439d78..1002009f5ab5e7ce05b3631fd0da163dd1325771 100644 (file)
--- a/test/confs/5101
+++ b/test/confs/5101
@@ -1,13 +1,8 @@
 # Exim test configuration 5101
 
 # Exim test configuration 5101
 

-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -40,7 +35,7 @@ local_delivery:
   envelope_to_add
   headers_add = X-Recipient: local_part=$local_part domain=$domain\n\
                 X-Home: $home
   envelope_to_add
   headers_add = X-Recipient: local_part=$local_part domain=$domain\n\
                 X-Home: $home

-  file = DIR/test-mail/${if eq{$sender_address}{}{copied}{$h_mailbox:}}
+  file = DIR/test-mail/${if eq{$sender_address}{}{copied}{${bless:$h_mailbox:}}}

   user = CALLER
 
 lmtp:
   user = CALLER
 
 lmtp: