From c44ff8bea951faba4aae92b868b69e221bf7b52b Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 25 Feb 2018 15:24:26 +0000
Subject: Auths: for A-R header, and SMTP auth, note the public-name not the
 authenticator name        Also, for TLS auth use a custom propspec

---
 test/confs/3700 | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'test/confs/3700')

diff --git a/test/confs/3700 b/test/confs/3700
index 00a17b497..6578ecb2d 100644
--- 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_data = ar_header
+
 queue_only
 queue_run_in_order
 trusted_users = CALLER
@@ -36,6 +38,8 @@ check_authd:
           !authenticated = *
   accept
 
+ar_header:
+  accept  add_header = :at_start:${authresults {$primary_hostname}}
 
 # ----- Authentication -----
 
@@ -54,9 +58,14 @@ tls:
 
 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 -----
@@ -82,4 +91,9 @@ t2:
   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames = :
 
+file:
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  user = CALLER
+
 # End
-- 
cgit v1.2.3