SPF: shortcircuit SPF RR lookups. Bug 1294

[exim.git] / test / confs / 0097

diff --git a/test/confs/0097 b/test/confs/0097
index c8e773fc2a08848259d914f28727620d49b137ad..0841952bf1cefb1d1c9ce5bec8f44766411ddac2 100644 (file)
--- a/test/confs/0097
+++ b/test/confs/0097
@@ -1,12 +1,7 @@
 # Exim test configuration 0097
 
 # Exim test configuration 0097
 

-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 -----
 
 
 # ----- Main settings -----
 


@@ -21,7 +16,8 @@ localuser:
   driver = accept
   local_parts = userx
   headers_add = "${if def:h_x-rbl-warning: {Added: by router}}"
   driver = accept
   local_parts = userx
   headers_add = "${if def:h_x-rbl-warning: {Added: by router}}"

-  headers_remove = "${if def:h_x-rbl-warning: {subject}}"
+  # Colon-sep list!
+  headers_remove = "${if def::h_x-rbl-warning:: {subject}}"

   transport = local_delivery
 
 
   transport = local_delivery
 
 


@@ -35,7 +31,7 @@ local_delivery:
   envelope_to_add
   file = DIR/test-mail/$local_part
   headers_add = "${if def:h_tadd: {Added: by transport}}"
   envelope_to_add
   file = DIR/test-mail/$local_part
   headers_add = "${if def:h_tadd: {Added: by transport}}"

-  headers_remove = "${if def:h_tadd: {tadd}}"
+  headers_remove = "${if def::h_tadd:: {tadd}}"

   return_path_add
   user = CALLER
 
   return_path_add
   user = CALLER