SPF: enhance A-R result

[users/jgh/exim.git] / test / confs / 0100

diff --git a/test/confs/0100 b/test/confs/0100
index c404d5a73f663c2bd5db8b7b36735ba89f2cd97a..afe04a4c1c95bdbfc1e139061728c7f24437c809 100644 (file)
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -72,17 +72,19 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 filtered_smtp:
   driver = smtp
   port = PORT_S
 
 filtered_smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
 
 local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
 
 local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add

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

   return_path_add
   current_directory = /
   user = CALLER
   return_path_add
   current_directory = /
   user = CALLER


@@ -91,7 +93,7 @@ hackfree_local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
   driver = appendfile
   delivery_date_add
   envelope_to_add

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

   check_string =
   return_path_add
   user = CALLER
   check_string =
   return_path_add
   user = CALLER


@@ -103,7 +105,7 @@ bsmtp_local_delivery:
   use_bsmtp
   delivery_date_add
   envelope_to_add
   use_bsmtp
   delivery_date_add
   envelope_to_add

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

   return_path_add
   user = CALLER
   current_directory = /
   return_path_add
   user = CALLER
   current_directory = /


@@ -114,7 +116,7 @@ bsmtp_local_delivery_filtered:
   use_bsmtp
   delivery_date_add
   envelope_to_add
   use_bsmtp
   delivery_date_add
   envelope_to_add

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

   return_path_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
   user = CALLER
   return_path_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
   user = CALLER


@@ -134,7 +136,7 @@ filtered_local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
   driver = appendfile
   delivery_date_add
   envelope_to_add

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

   return_path_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
   current_directory = /
   return_path_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
   current_directory = /


@@ -144,7 +146,7 @@ mmdf_local_delivery:
   driver = appendfile
   check_string = "\1\1\1\1\n"
   escape_string = "\1\1\1\1 \n"
   driver = appendfile
   check_string = "\1\1\1\1\n"
   escape_string = "\1\1\1\1 \n"

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

   message_prefix = "\1\1\1\1\n"
   message_suffix = "\1\1\1\1\n"
   user = CALLER
   message_prefix = "\1\1\1\1\n"
   message_suffix = "\1\1\1\1\n"
   user = CALLER