DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0307

diff --git a/test/confs/0307 b/test/confs/0307
index 5e664452bf59367438db514757b6bf6029f4554e..e07ef794f2668df0a63522adf282a8df61914e24 100644 (file)
--- a/test/confs/0307
+++ b/test/confs/0307
@@ -1,13 +1,8 @@
 # Exim test configuration 0307
 
 # Exim test configuration 0307
 

-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
-tls_advertise_hosts =

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


@@ -24,12 +19,10 @@ r1:
   domains = lists.test.ex
   local_part_suffix = -request
   local_part_suffix_optional
   domains = lists.test.ex
   local_part_suffix = -request
   local_part_suffix_optional

-  senders = ${if eq {$local_part_suffix}{-request}{*}\
-            {\
-            ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\
-             {lsearch;DIR/aux-fixed/TESTNUM/$local_part}{*}}\
-            }}
-  file = DIR/aux-fixed/TESTNUM/$local_part$local_part_suffix
+  senders = ${if eq {$local_part_suffix}{-request} \
+             {*} \
+             {${lookup {$local_part} dsearch,ret=full {DIR/aux-fixed/TESTNUM} {$value}{*}}} }
+  file = ${lookup {$local_part$local_part_suffix} dsearch,ret=full {DIR/aux-fixed/TESTNUM} {$value}fail}

   forbid_pipe
   forbid_file
   one_time
   forbid_pipe
   forbid_file
   one_time


@@ -60,6 +53,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
 
 t2:
   user = CALLER
 
 t2: