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
Tidying: coverity issues
[users/jgh/exim.git]
/
test
/
confs
/
4201
diff --git
a/test/confs/4201
b/test/confs/4201
index 36e38bcd582da6c02a7b805191ea6cf1bc543872..298eb847d80bb81c10d9df470216f6f11a2299ee 100644
(file)
--- a/
test/confs/4201
+++ b/
test/confs/4201
@@
-2,21
+2,28
@@
# SMTPUTF8 handling
OPTION = *
# SMTPUTF8 handling
OPTION = *
+CONTROL =
+INSERT =
+SUB =
exim_path = EXIM_PATH
exim_path = EXIM_PATH
+keep_environment =
host_lookup_order = bydns
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
host_lookup_order = bydns
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
+tls_advertise_hosts =
# ----- Main settings -----
# ----- Main settings -----
-domainlist local_domains = test.ex
+domainlist local_domains = test.ex
: cname
acl_smtp_rcpt = check_recipient
acl_smtp_rcpt = check_recipient
+acl_not_smtp = non_smtp
+
trusted_users = CALLER
trusted_users = CALLER
-log_selector = +received_recipients
+log_selector = +received_recipients
+sender_on_delivery
.ifdef SERVER
queue_only
.ifdef SERVER
queue_only
@@
-25,20
+32,44
@@
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
+.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
+
+.endif
+
# ----- Routers -----
begin routers
# ----- Routers -----
begin routers
@@
-50,12
+81,24
@@
fail_remote_domains:
domains = ! +local_domains
data = :fail: unrouteable mail domain "$domain"
domains = ! +local_domains
data = :fail: unrouteable mail domain "$domain"
+bounces:
+ driver = redirect
+ condition = ${if eq {} {$sender_address}}
+ data = DIR/test-mail/$local_part
+ file_transport = local_delivery
+
localuser:
driver = redirect
data = :blackhole:
.else
localuser:
driver = redirect
data = :blackhole:
.else
+bounces:
+ driver = redirect
+ domains = *.local
+ data = DIR/test-mail/$local_part
+ file_transport = local_delivery
+
rmt:
driver = manualroute
domains = +local_domains
rmt:
driver = manualroute
domains = +local_domains
@@
-63,10
+106,6
@@
rmt:
transport = rmt_smtp
self = send
transport = rmt_smtp
self = send
-hole:
- driver = redirect
- data = :blackhole:
-
.endif
# ----- Transports -----
.endif
# ----- Transports -----
@@
-75,6
+114,7
@@
begin transports
local_delivery:
driver = appendfile
local_delivery:
driver = appendfile
+ user = CALLER
delivery_date_add
envelope_to_add
file = DIR/test-mail/$local_part
delivery_date_add
envelope_to_add
file = DIR/test-mail/$local_part