Cutthrough: logging of return_path

[exim.git] / test / confs / 0230

diff --git a/test/confs/0230 b/test/confs/0230
index 82c0c0432680d96a733c5668824329784410645d..41bfa869759e694d4c697bb82b84a46776a9de8e 100644 (file)
--- a/test/confs/0230
+++ b/test/confs/0230
@@ -2,14 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -18,7 +13,7 @@ acl_smtp_rcpt = check_recipient
 log_selector =  \
               +incoming_port \
               +incoming_interface \
 log_selector =  \
               +incoming_port \
               +incoming_interface \

-              +smtp_connection
+              +smtp_connection +connection_id

 queue_only
 queue_run_in_order
 
 queue_only
 queue_run_in_order
 


@@ -37,6 +32,14 @@ check_recipient:
 
 begin routers
 
 
 begin routers
 

+.ifdef OPT
+to_server:
+  driver = manualroute
+  transport = remote
+  route_list = * 127.0.0.1
+  self = send
+.endif
+

 fail_remote_domains:
   driver = redirect
   domains = ! +local_domains
 fail_remote_domains:
   driver = redirect
   domains = ! +local_domains


@@ -55,9 +58,14 @@ begin transports
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   headers_add = Port: $sender_host_port
   user = CALLER
 
   headers_add = Port: $sender_host_port
   user = CALLER
 

+remote:
+  driver = smtp
+  port = PORT_D
+  hosts_try_fastopen = :

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