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
Build: workaround inlining problems on Solaris
[users/jgh/exim.git]
/
test
/
confs
/
4201
diff --git
a/test/confs/4201
b/test/confs/4201
index aea46844794433c0c473181334315d752affc154..17afe9f782fcf8f48f5e08477c6e5ddc893c5ac2 100644
(file)
--- a/
test/confs/4201
+++ b/
test/confs/4201
@@
-2,17
+2,16
@@
# SMTPUTF8 handling
OPTION = *
# SMTPUTF8 handling
OPTION = *
+CONTROL =
+INSERT =
+SUB =
+
+.include DIR/aux-var/std_conf_prefix
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
-domainlist local_domains = test.ex
+domainlist local_domains = test.ex
: cname
acl_smtp_rcpt = check_recipient
acl_not_smtp = non_smtp
acl_smtp_rcpt = check_recipient
acl_not_smtp = non_smtp
@@
-27,25
+26,42
@@
queue_run_in_order
smtputf8_advertise_hosts = OPTION
smtputf8_advertise_hosts = OPTION
+SUB
+
# ----- ACL -----
begin acl
# ----- ACL -----
begin acl
-check_recipient:
-.if
n
def SERVER
- accept domains = *
-.endif
+.ifdef SERVER
+
+check_recipient:
accept hosts = :
accept domains = +local_domains
accept hosts = :
accept domains = +local_domains
+ local_parts = ^(xn--)?user.*\$
deny message = relay not permitted
deny message = relay not permitted
-.ifndef SERVER
+.else
+
+sub:
+.ifdef INSERT
+ require INSERT
+.endif
+.ifdef CONTROL
+ require CONTROL
+.endif
+ accept
+
+check_recipient:
+ accept domains = *
+ acl = sub
+
non_smtp:
accept senders = :
control = queue_only
accept
non_smtp:
accept senders = :
control = queue_only
accept
+
.endif
# ----- Routers -----
.endif
# ----- Routers -----
@@
-77,6
+93,11
@@
bounces:
data = DIR/test-mail/$local_part
file_transport = local_delivery
data = DIR/test-mail/$local_part
file_transport = local_delivery
+redir:
+ driver = redirect
+ local_parts = ^z
+ data = ${substr_1:$local_part}@$domain
+
rmt:
driver = manualroute
domains = +local_domains
rmt:
driver = manualroute
domains = +local_domains
@@
-103,5
+124,8
@@
local_delivery:
rmt_smtp:
driver = smtp
rmt_smtp:
driver = smtp
+.ifdef STRICT
+ utf8_downconvert = STRICT
+.endif
# End
# End