OpenSSL: Fix aggregation of messages.

[exim.git] / test / confs / 3700

diff --git a/test/confs/3700 b/test/confs/3700
index 1565b5f79fe68f92cb0585e7768b8944362fe5d1..6578ecb2d14737caac69142b56414594424415d3 100644 (file)
--- a/test/confs/3700
+++ b/test/confs/3700
@@ -2,20 +2,18 @@
 
 SERVER=
 
 
 SERVER=
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix

 
 

+primary_hostname = myhost.test.ex

 log_selector = +received_recipients +outgoing_port
 
 # ----- Main settings -----
 
 log_selector = +received_recipients +outgoing_port
 
 # ----- 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


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


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


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