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
OpenSSL: revert needless free of certificate list. The library handlies it internally.
[users/jgh/exim.git]
/
test
/
confs
/
4201
diff --git
a/test/confs/4201
b/test/confs/4201
index b34c7c1f9ff9f5c2aa7e14cf218cb67908709235..e12e13828b5daa93b373a549db6f646e86299db5 100644
(file)
--- a/
test/confs/4201
+++ b/
test/confs/4201
@@
-3,13
+3,11
@@
OPTION = *
CONTROL =
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 -----
@@
-28,6
+26,8
@@
queue_run_in_order
smtputf8_advertise_hosts = OPTION
smtputf8_advertise_hosts = OPTION
+SUB
+
# ----- ACL -----
# ----- ACL -----
@@
-39,12
+39,15
@@
begin acl
check_recipient:
accept hosts = :
accept domains = +local_domains
check_recipient:
accept hosts = :
accept domains = +local_domains
- local_parts = ^user.*\$
+ local_parts = ^
(xn--)?
user.*\$
deny message = relay not permitted
.else
sub:
deny message = relay not permitted
.else
sub:
+.ifdef INSERT
+ require INSERT
+.endif
.ifdef CONTROL
require CONTROL
.endif
.ifdef CONTROL
require CONTROL
.endif