Fix -bi. Bug 2590

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

diff --git a/test/confs/3700 b/test/confs/3700
index 00a17b497645c72be632716bb3a39761eec6df55..4a8d38aaef63f3e07faa073e3c936ab9a8428694 100644 (file)
--- a/test/confs/3700
+++ b/test/confs/3700
@@ -12,6 +12,8 @@ log_selector = +received_recipients +outgoing_port
 acl_smtp_auth = log_call
 acl_smtp_mail = check_authd
 acl_smtp_rcpt = check_authd
 acl_smtp_auth = log_call
 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


@@ -36,6 +38,8 @@ check_authd:
           !authenticated = *
   accept
 
           !authenticated = *
   accept
 

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

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


@@ -54,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 -----


@@ -67,6 +76,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   allow_localhost
   tls_certificate =         DIR/aux-fixed/cert2
   tls_verify_certificates = DIR/aux-fixed/cert1
   allow_localhost
   tls_certificate =         DIR/aux-fixed/cert2
   tls_verify_certificates = DIR/aux-fixed/cert1


@@ -76,10 +86,16 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   protocol = smtps
   allow_localhost
   tls_certificate =         DIR/aux-fixed/cert2
   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames = :
 
   protocol = smtps
   allow_localhost
   tls_certificate =         DIR/aux-fixed/cert2
   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames = :
 

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

 # End
 # End