Merge branch '4.next'

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

diff --git a/test/confs/0137 b/test/confs/0137
index b69bf640b9265f2700b3e19026c9570566e53e78..7c48d62349121cf588817ed9460cdbbf7cfb9ded 100644 (file)
--- a/test/confs/0137
+++ b/test/confs/0137
@@ -1,17 +1,14 @@
 # Exim test configuration 0137
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
+log_selector = +subject
 domainlist local_domains = test.ex
 qualify_domain = test.ex
+untrusted_set_sender = *
 
 
 # ----- Routers -----
@@ -21,7 +18,10 @@ begin routers
 smart:
   driver = accept
   retry_use_local_part
-  transport = $h_transport:
+  transport = ${if eq {t1}{$sender_address_local_part} {local_delivery} \
+               {${if eq {t2}{$sender_address_local_part} {local_delivery_fcntl} \
+               {${if eq {t3}{$sender_address_local_part} {local_delivery_fcntl_blocking} \
+               {} }}}}}
 
 
 # ----- Transports -----