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
Docs: add info on router variable evaluation order
[users/heiko/exim.git]
/
test
/
confs
/
3403
diff --git
a/test/confs/3403
b/test/confs/3403
index 9f62506da58e7e8def39fd320cd3a2327e67ff5e..5d59e6dee9efcd499cc46f193418182c4f67d370 100644
(file)
--- a/
test/confs/3403
+++ b/
test/confs/3403
@@
-1,18
+1,13
@@
# Exim test configuration 3403
# Exim test configuration 3403
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
primary_hostname = myhost.test.ex
primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
# ----- Main settings -----
acl_smtp_rcpt = accept
# ----- Main settings -----
acl_smtp_rcpt = accept
+acl_smtp_data = check_data
# ----- Authentication -----
# ----- Authentication -----
@@
-32,6
+27,12
@@
plain1:
server_mail_auth_condition = ${if eq{$authenticated_id}{userx}{yes}}
server_mail_auth_condition = ${if eq{$authenticated_id}{userx}{yes}}
+# ----- ACL -----
+begin acl
+
+check_data:
+ accept add_header = :at_start:${authresults {$primary_hostname}}
+
# ----- Routers -----
begin routers
# ----- Routers -----
begin routers
@@
-39,6
+40,7
@@
begin routers
d1:
driver = accept
headers_add = aid: $authenticated_id
d1:
driver = accept
headers_add = aid: $authenticated_id
+ headers_add = rtr_authres: ${authresults {$primary_hostname}}
retry_use_local_part
transport = t1
retry_use_local_part
transport = t1
@@
-49,7
+51,7
@@
begin transports
t1:
driver = appendfile
t1:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
user = CALLER
# End
user = CALLER
# End