Make def:<var> compatible between "static" and "dynamic" vars.

[users/jgh/exim.git] / test / confs / 0029

diff --git a/test/confs/0029 b/test/confs/0029
index d0c6708192d812faeea3a3b653f3c1cfc9f5e45c..342e6a5ec4bc79025680bab391099953afd19530 100644 (file)
--- a/test/confs/0029
+++ b/test/confs/0029
@@ -1,13 +1,8 @@
 # Exim test configuration 0029
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -21,8 +16,8 @@ begin acl
 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