X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/23f3dc67a13f71bb8fdf2930052d3fdce85e9774..32a167571d19dc17c709616320917276e8d82c3b:/test/confs/0102?ds=sidebyside diff --git a/test/confs/0102 b/test/confs/0102 index e9e7512df..c73eed924 100644 --- a/test/confs/0102 +++ b/test/confs/0102 @@ -1,12 +1,7 @@ # Exim test configuration 0102 -exim_path = EXIM_PATH -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 ----- @@ -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