DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0567

diff --git a/test/confs/0567 b/test/confs/0567
index 5eae157f8880e1c1e724fb503b3a5af29075092d..b85f3b5fe0f00a51cf3eca0fbcef16adfb2a0da4 100644 (file)
--- a/test/confs/0567
+++ b/test/confs/0567
@@ -2,13 +2,9 @@
 
 CONNECTCOND=
 
 
 CONNECTCOND=
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -62,6 +58,7 @@ data:
          remove_header = x-data-2
   warn   log_message   = Verified removed header X-Data-3 in this ACL still visible
          condition     = ${if !eq{$h_x-data-3:}{}}
          remove_header = x-data-2
   warn   log_message   = Verified removed header X-Data-3 in this ACL still visible
          condition     = ${if !eq{$h_x-data-3:}{}}

+  warn  remove_header = \N^(?i)Authentication-Results\s*::\s*remove.org;\N

   accept
 
 notsmtp:
   accept
 
 notsmtp:


@@ -85,6 +82,7 @@ begin transports
 t1:
   driver = appendfile
   file = DIR/test-mail/$local_part
 t1:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
 
 # End
   user = CALLER
 
 # End