DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0251

diff --git a/test/confs/0251 b/test/confs/0251
index aa9d4ec0daf45f6bf8f253b1a4ae93b5fe5a6770..ebad92684af0a58659f65a15645fec20e5e56149 100644 (file)
--- a/test/confs/0251
+++ b/test/confs/0251
@@ -2,15 +2,9 @@
 
 SERVER =
 
 
 SERVER =
 

-exim_path = EXIM_PATH
-keep_environment =
-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/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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


@@ -38,14 +32,13 @@ exeter_listr:
   no_check_local_user
   domains = listr.test.ex
   errors_to = ${local_part}-request@test.ex
   no_check_local_user
   domains = listr.test.ex
   errors_to = ${local_part}-request@test.ex

-  file = DIR/aux-fixed/TESTNUM.list.${local_part}
+  file = ${lookup {TESTNUM.list.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}

   forbid_file
   forbid_pipe
   one_time
   require_files = DIR/aux-fixed/TESTNUM.restrict.${local_part}
   retry_use_local_part
   forbid_file
   forbid_pipe
   one_time
   require_files = DIR/aux-fixed/TESTNUM.restrict.${local_part}
   retry_use_local_part

-  senders = ${if exists{DIR/aux-fixed/TESTNUM.restrict.${local_part}} \
-    {DIR/aux-fixed/TESTNUM.restrict.${local_part}}{zzzz}}
+  senders = ${lookup {TESTNUM.restrict.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value} {zzzz}}

   syntax_errors_to = ${local_part}-request@test.ex
 
 exeter_listf:
   syntax_errors_to = ${local_part}-request@test.ex
 
 exeter_listf: