Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / confs / 5204

diff --git a/test/confs/5204 b/test/confs/5204
index 5cf753aeb243610c3aae04d02b86e12ada4fb71c..a6812213bc5dc07a95c61dc106ae33e26eba3a65 100644 (file)
--- a/test/confs/5204
+++ b/test/confs/5204
@@ -2,13 +2,9 @@
 
 COMMAND_USER=EXIMUSER
 
 
 COMMAND_USER=EXIMUSER
 

-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

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

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


@@ -55,9 +51,11 @@ begin transports
 
 smtp:
   driver = smtp
 
 smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 other_smtp:
   driver = smtp
 
 other_smtp:
   driver = smtp

+  hosts_try_fastopen = :

 
 null:
   driver = appendfile
 
 null:
   driver = appendfile


@@ -66,7 +64,7 @@ null:
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

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

   user = CALLER
 
 
   user = CALLER