git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DKIM: ensure that dkim_domain elements are lowercased before use. Bug 2371
[exim.git]
/
test
/
confs
/
0906
diff --git
a/test/confs/0906
b/test/confs/0906
index 2e8d35a9112f6aac8b2123b9864e55e4b940b750..ff99d9304cca3f059e8ca4010871e51fdb99aa40 100644
(file)
--- a/
test/confs/0906
+++ b/
test/confs/0906
@@
-10,6
+10,9
@@
gecos_pattern = ""
gecos_name = CALLER_NAME
chunking_advertise_hosts = *
tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
gecos_name = CALLER_NAME
chunking_advertise_hosts = *
tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts =
+.endif
# ----- Main settings -----
# ----- Main settings -----
@@
-18,16
+21,30
@@
spool_wireformat = true
primary_hostname = testhost.test.ex
domainlist local_domains = @ : test.ex
primary_hostname = testhost.test.ex
domainlist local_domains = @ : test.ex
-acl_smtp_rcpt = accept
+acl_smtp_rcpt = acl_r
+
+.ifdef _HAVE_DKIM
+log_selector = +received_recipients +dkim_verbose
+.else
log_selector = +received_recipients
log_selector = +received_recipients
+.endif
+
.ifdef _OPT_MAIN_TLS_CERTIFICATE
tls_certificate = DIR/aux-fixed/cert1
tls_privatekey = DIR/aux-fixed/cert1
.endif
.ifdef _OPT_MAIN_TLS_CERTIFICATE
tls_certificate = DIR/aux-fixed/cert1
tls_privatekey = DIR/aux-fixed/cert1
.endif
+queue_run_in_order = true
+
# ----- ACL -----
# ----- ACL -----
+begin acl
+acl_r:
+ accept condition = ${if != {$received_port}{PORT_S}}
+ control = queue_only
+ accept
+
# ----- Routers -----
begin routers
# ----- Routers -----
begin routers