git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARC: harden versus badly-formatted AMS line
[users/jgh/exim.git]
/
test
/
confs
/
3700
diff --git
a/test/confs/3700
b/test/confs/3700
index 00a17b497645c72be632716bb3a39761eec6df55..6578ecb2d14737caac69142b56414594424415d3 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 -----
@@
-82,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