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
Testsuite: Output the --version from exigrep, exinext, eximstats
[users/jgh/exim.git]
/
test
/
confs
/
4520
diff --git
a/test/confs/4520
b/test/confs/4520
index 4497028553f605ef86b3107fb5348708e7a7be95..8fa3c38c8323089dbde683d0d03e90f946289646 100644
(file)
--- a/
test/confs/4520
+++ b/
test/confs/4520
@@
-9,9
+9,10
@@
primary_hostname = myhost.test.ex
# ----- Main settings -----
# ----- Main settings -----
-acl_smtp_rcpt = accept
+acl_smtp_rcpt = accept
logwrite = macro: _DKIM_SIGN_HEADERS
acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
+DDIR=DIR/aux-fixed/dkim
# ----- Routers
# ----- Routers
@@
-42,9
+43,15
@@
send_to_server:
.else
dkim_selector = sel
.endif
.else
dkim_selector = sel
.endif
- dkim_private_key = DIR/aux-fixed/dkim/dkim.private
+
+ dkim_private_key = ${if match {$dkim_selector}{^ses} {DDIR/dkim512.private} \
+ {${if match {$dkim_selector}{^sel} {DDIR/dkim.private} \
+ {}}}}
+
.ifndef HEADERS_MAXSIZE
dkim_sign_headers = OPT
.ifndef HEADERS_MAXSIZE
dkim_sign_headers = OPT
+.else
+ dkim_identity = allheaders@$dkim_domain
.endif
.ifdef VALUE
dkim_hash = VALUE
.endif
.ifdef VALUE
dkim_hash = VALUE