DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0029

diff --git a/test/confs/0029 b/test/confs/0029
index a4eb1b1db3f468140451dbac06b9b68b50c521bd..342e6a5ec4bc79025680bab391099953afd19530 100644 (file)
--- a/test/confs/0029
+++ b/test/confs/0029
@@ -1,13 +1,8 @@
 # Exim test configuration 0029
 
 # Exim test configuration 0029
 

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


@@ -21,8 +16,8 @@ begin acl
 check_rcpt:
   require  verify = sender
            verify = sender=\
 check_rcpt:
   require  verify = sender
            verify = sender=\

-                    ${if eq {${domain:$sender_address}}{test.ex}\
-                    {${local_part:$sender_address}@abc.test.ex}\
+                    ${if eq {$sender_address_domain}{test.ex}\
+                    {$sender_address_local_part@abc.test.ex}\

                     {$sender_address}}
   accept
 
                     {$sender_address}}
   accept