Fix DISABLE_DKIM biuld

[exim.git] / test / confs / 5400

diff --git a/test/confs/5400 b/test/confs/5400
index 2bbe6965a440063371bd09eb1b47ed366daaec8e..9be13fea6b4f24184306b74fa786ed8de1092f98 100644 (file)
--- a/test/confs/5400
+++ b/test/confs/5400
@@ -1,16 +1,17 @@
 # Exim test configuration 5400
 
 # Exim test configuration 5400
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+# any options on the cutthrough_delivery contol
+CONTROL=
+
+# optional verify-callout
+OPT=
+
+.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 =

 
 log_selector = +received_recipients
 
 log_selector = +received_recipients

+queue_only

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


@@ -24,7 +25,9 @@ acl_smtp_rcpt = ar
 begin acl
 
 ar:
 begin acl
 
 ar:

-       accept control = cutthrough_delivery
+  accept
+       control = cutthrough_deliveryCONTROL
+       OPT

        logwrite = rcpt for $local_part@$domain
 
 # ----- Routers -----
        logwrite = rcpt for $local_part@$domain
 
 # ----- Routers -----


@@ -45,6 +48,7 @@ all:
   transport = ${if eq {special_tpt}{$local_part} {smtp2}{smtp}}
   headers_remove = X-hdr-rtr
   headers_add =    X-hdr-rtr-new: $h_X-hdr-rtr:+++
   transport = ${if eq {special_tpt}{$local_part} {smtp2}{smtp}}
   headers_remove = X-hdr-rtr
   headers_add =    X-hdr-rtr-new: $h_X-hdr-rtr:+++

+  errors_to =     ""

   no_more
 
 
   no_more