X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/0b8f4f1a0c68bd48a98fb033039bac7d88182b6f..fa7b17bdbc8c055c475a50791627cd75d257f4f3:/test/confs/4520 diff --git a/test/confs/4520 b/test/confs/4520 index 9092c74dc..1a8e34f9e 100644 --- a/test/confs/4520 +++ b/test/confs/4520 @@ -14,7 +14,7 @@ acl_smtp_rcpt = accept logwrite = rcpt acl: macro: _DKIM_SIGN_HEADERS acl_smtp_dkim = accept logwrite = dkim_acl: signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames acl_smtp_data = accept logwrite = data acl: dkim status $dkim_verify_status -dkim_verify_signers = $dkim_signers : FAKE +dkim_verify_signers = $dkim_signers DDIR=DIR/aux-fixed/dkim @@ -24,14 +24,14 @@ log_selector = -dkim +dkim_verbose begin routers -server_dump: - driver = redirect - condition = ${if eq {SERVER}{server}{yes}{no}} - data = :blackhole: +server_store: + driver = accept + condition = ${if eq {SERVER}{server}{yes}{no}} + transport = file client: - driver = accept - transport = send_to_server + driver = accept + transport = send_to_server # ----- Transports @@ -50,9 +50,11 @@ send_to_server: dkim_selector = sel .endif - dkim_private_key = ${if match {$dkim_selector}{^ses} {DDIR/dkim512.private} \ - {${if match {$dkim_selector}{^sel} {DDIR/dkim.private} \ - {}}}} + dkim_private_key = ${extract {${length_3:$dkim_selector}} {\ + ses=dkim512.private \ + sel=dkim.private \ + sed=dkim_ed25519.private \ + }{DDIR/$value}} .ifndef HEADERS_MAXSIZE dkim_sign_headers = OPT @@ -65,5 +67,13 @@ send_to_server: .ifdef STRICT dkim_strict = STRICT .endif +.ifdef TIMES + dkim_timestamps = TIMES +.endif + +file: + driver = appendfile + file = DIR/test-mail/$local_part + user = CALLER # End