DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0102

diff --git a/test/confs/0102 b/test/confs/0102
index dd17eb840a403b2612812cb131cc99077e6de1d1..c73eed924919be14556966baffd8ee267dce7226 100644 (file)
--- a/test/confs/0102
+++ b/test/confs/0102
@@ -1,12 +1,7 @@
 # Exim test configuration 0102
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
@@ -30,7 +25,9 @@ localuser:
   local_part_prefix = bsmtp_ : mmdf_
   local_part_prefix_optional
   retry_use_local_part
-  transport = ${local_part_prefix}local_delivery
+  transport = ${if !def:local_part_prefix {} \
+               {${if eq {bsmtp_}{$local_part_prefix} {bsmtp_}\
+                       {${if eq {mmdf_}{$local_part_prefix} {mmdf_} {}}}}}}local_delivery
 
 
 # ----- Transports -----
@@ -42,6 +39,7 @@ local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   file_format = "From       : local_delivery :\
                  MAIL       : bsmtp_local_delivery :\
                  \1\1\1\1\n : mmdf_local_delivery :\
@@ -56,6 +54,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
 
@@ -64,6 +63,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