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

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

diff --git a/test/confs/0481 b/test/confs/0481
index c4f512fee63739c24a19f884573052808375d2f3..cdd6453dc20db9ec2e0777e7dd0ced6c5ef2747f 100644 (file)
--- a/test/confs/0481
+++ b/test/confs/0481
@@ -1,14 +1,8 @@
 # Exim test configuration 0481
 
 # Exim test configuration 0481
 

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

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


@@ -31,7 +25,7 @@ r2:
 
 r3:
   driver = accept
 
 r3:
   driver = accept

-  headers_remove = Remove-Me:
+  headers_remove = Remove-Me:X-Rem*

   headers_add = X-Was-Remove-Me: >$h_remove-me:<
   headers_add = ${if def:h_remove-me-also {X-Was-Remove-Me-Also: >$h_remove-me-also:<}}
   transport = t1
   headers_add = X-Was-Remove-Me: >$h_remove-me:<
   headers_add = ${if def:h_remove-me-also {X-Was-Remove-Me-Also: >$h_remove-me-also:<}}
   transport = t1


@@ -43,7 +37,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
 
 
   user = CALLER