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
Testsuite: fix macro conflict (X vs. HEADERS_MAXSIZE)
[users/heiko/exim.git]
/
test
/
confs
/
0900
diff --git
a/test/confs/0900
b/test/confs/0900
index 427669c4bf1e29a61cb9c9a2c0c37659e5b8faaa..2eaf01ee3e661070ff9518388be7eba3ee037bbe 100644
(file)
--- a/
test/confs/0900
+++ b/
test/confs/0900
@@
-1,8
+1,7
@@
# Exim test configuration 0900
SERVER=
# Exim test configuration 0900
SERVER=
-X=
Y=
Y=
-
OP
T=
+
LIS
T=
ALLOW=
exim_path = EXIM_PATH
ALLOW=
exim_path = EXIM_PATH
@@
-18,6
+17,7
@@
tls_advertise_hosts = ${if eq {Y}{tls} {*}}
# ----- Main settings -----
# ----- Main settings -----
+primary_hostname = testhost.test.ex
domainlist local_domains = @ : test.ex
acl_smtp_rcpt = check_recipient
domainlist local_domains = @ : test.ex
acl_smtp_rcpt = check_recipient
@@
-58,7
+58,7
@@
begin routers
to_server:
driver = accept
condition = ${if !eq {SERVER}{server}}
to_server:
driver = accept
condition = ${if !eq {SERVER}{server}}
- transport = remote_smtp${if eq {
X
}{dkim} {_dkim}}
+ transport = remote_smtp${if eq {
OPT
}{dkim} {_dkim}}
errors_to = ""
fail_remote_domains:
errors_to = ""
fail_remote_domains:
@@
-103,11
+103,13
@@
remote_smtp_dkim:
command_timeout = 2s
final_timeout = 2s
command_timeout = 2s
final_timeout = 2s
+.ifdef OPT
dkim_domain = test.ex
dkim_selector = sel
dkim_private_key = DIR/aux-fixed/dkim/dkim.private
.ifndef HEADERS_MAXSIZE
dkim_domain = test.ex
dkim_selector = sel
dkim_private_key = DIR/aux-fixed/dkim/dkim.private
.ifndef HEADERS_MAXSIZE
- dkim_sign_headers = OPT
+ dkim_sign_headers = LIST
+.endif
.endif
# ----- Retry -----
.endif
# ----- Retry -----