Fix cutthrough delivery for more than one iteration of address redirection. Bug...

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

diff --git a/test/confs/3700 b/test/confs/3700
index 94bd26ebdf3c0ab7107effbcfcaf3317e5fc7243..6578ecb2d14737caac69142b56414594424415d3 100644 (file)
--- a/test/confs/3700
+++ b/test/confs/3700
@@ -9,8 +9,11 @@ log_selector = +received_recipients +outgoing_port
 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

+acl_smtp_auth = log_call

 acl_smtp_mail = check_authd
 acl_smtp_rcpt = check_authd
 acl_smtp_mail = check_authd
 acl_smtp_rcpt = check_authd

+acl_smtp_data = ar_header
+

 queue_only
 queue_run_in_order
 trusted_users = CALLER
 queue_only
 queue_run_in_order
 trusted_users = CALLER


@@ -27,11 +30,16 @@ tls_verify_certificates = DIR/aux-fixed/cert2
 
 begin acl
 
 
 begin acl
 

+log_call:
+  accept   logwrite = Auth ACL called, after smtp cmd "$smtp_command"
+

 check_authd:
   deny     message = authentication required
           !authenticated = *
   accept
 
 check_authd:
   deny     message = authentication required
           !authenticated = *
   accept
 

+ar_header:
+  accept  add_header = :at_start:${authresults {$primary_hostname}}

 
 # ----- Authentication -----
 
 
 # ----- Authentication -----
 


@@ -50,9 +58,14 @@ tls:
 
 begin routers
 
 
 begin routers
 

-r1:
-  driver = accept
-  transport = ${if eq {$local_part}{smtps} {t2}{t1}}
+server_r:
+  driver =     accept
+  condition =  ${if eq {server}{SERVER}}
+  transport =  file
+
+client_r1:
+  driver =     accept
+  transport =  ${if eq {$local_part}{smtps} {t2}{t1}}

 
 
 # ----- Transports -----
 
 
 # ----- Transports -----


@@ -78,4 +91,9 @@ t2:
   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames = :
 
   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames = :
 

+file:
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  user = CALLER
+

 # End
 # End