Rewrites: avoid a split log line when rewiting hits a malformed address. Bug 3160

[exim.git] / test / confs / 0100

diff --git a/test/confs/0100 b/test/confs/0100
index 55cd947b5a3167d4b1d16911798a2128b891bf26..547684ca88c51dfd10200362959af35674b4f2f8 100644 (file)
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -1,13 +1,7 @@
 # Exim test configuration 0100
 
-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 -----
 
@@ -78,10 +72,12 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen = :
 
 filtered_smtp:
   driver = smtp
   port = PORT_S
+  hosts_try_fastopen = :
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
 
 local_delivery:
@@ -89,6 +85,7 @@ local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   current_directory = /
   user = CALLER
@@ -98,6 +95,7 @@ hackfree_local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   check_string =
   return_path_add
   user = CALLER
@@ -110,6 +108,7 @@ bsmtp_local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
   current_directory = /
@@ -121,6 +120,7 @@ bsmtp_local_delivery_filtered:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
   user = CALLER
@@ -141,6 +141,7 @@ filtered_local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
   current_directory = /
@@ -151,6 +152,7 @@ mmdf_local_delivery:
   check_string = "\1\1\1\1\n"
   escape_string = "\1\1\1\1 \n"
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   message_prefix = "\1\1\1\1\n"
   message_suffix = "\1\1\1\1\n"
   user = CALLER