Ensure lookup-result variables are dropped between messages on a connection

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

diff --git a/test/confs/0611 b/test/confs/0611
index ddd882462a60e5297b4039ad24f6f51f297a8948..84be24f05800cbb094e610694d696ef4d61b1e95 100644 (file)
--- a/test/confs/0611
+++ b/test/confs/0611
@@ -4,16 +4,23 @@
 SERVER=
 
 exim_path = EXIM_PATH
 SERVER=
 
 exim_path = EXIM_PATH

+keep_environment =

 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
 host_lookup_order = bydns
 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 =
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 tls_advertise_hosts =

+chunking_advertise_hosts =
+
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif

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

+log_file_path = DIR/spool/log/${if eq {SERVER}{server} {server_}{}}%slog
+

 qualify_domain = test.ex
 queue_run_in_order
 log_selector = +received_recipients
 qualify_domain = test.ex
 queue_run_in_order
 log_selector = +received_recipients


@@ -48,6 +55,7 @@ begin transports
 smtp:
   driver =     smtp
   port =       PORT_D
 smtp:
   driver =     smtp
   port =       PORT_D

+  hosts_try_fastopen = :

   max_rcpt =   1
   connection_max_messages = 1
   max_parallel = 2
   max_rcpt =   1
   connection_max_messages = 1
   max_parallel = 2