git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gsasl authenticator: support client salted-password caching
[users/heiko/exim.git]
/
test
/
confs
/
3700
diff --git
a/test/confs/3700
b/test/confs/3700
index 1565b5f79fe68f92cb0585e7768b8944362fe5d1..4a8d38aaef63f3e07faa073e3c936ab9a8428694 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 -----
@@
-68,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
@@
-77,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