Use dsn_from for success-DSN messages. Bug 2404

[exim.git] / test / confs / 0612

diff --git a/test/confs/0612 b/test/confs/0612
index cac65b1842ea5d487c2890751c6c7d99b23aa895..84260df657d6fa913f7651d29950682a75637de2 100644 (file)
--- a/test/confs/0612
+++ b/test/confs/0612
@@ -1,15 +1,9 @@
 # Exim test configuration 0612
 # log_defer_output on pipe transport
 
 # Exim test configuration 0612
 # log_defer_output on pipe transport
 

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


@@ -34,6 +28,7 @@ pipe:
     temp_errors = *
     command     = perl -e "print 'Hi from pipe'; exit 5;"
     log_defer_output = true
     temp_errors = *
     command     = perl -e "print 'Hi from pipe'; exit 5;"
     log_defer_output = true

+    path       = ${env{PATH}}

 
 # ----- Retry -----
 
 
 # ----- Retry -----