Logging: disable the verbose DKIM verification line by default; add a tag to <= lines.

[exim.git] / test / confs / 4520

diff --git a/test/confs/4520 b/test/confs/4520
index 4497028553f605ef86b3107fb5348708e7a7be95..8515d050d718508f0823966a24553b947c48b8d9 100644 (file)
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -2,6 +2,7 @@
 
 SERVER=
 OPT=
+FAKE =
 
 .include DIR/aux-var/std_conf_prefix
 
@@ -9,9 +10,15 @@ primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
-acl_smtp_rcpt = accept
-acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
+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
+
+DDIR=DIR/aux-fixed/dkim
+
+log_selector = -dkim +dkim_verbose
 
 # ----- Routers
 
@@ -42,9 +49,15 @@ send_to_server:
 .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
+.else
+  dkim_identity =      allheaders@$dkim_domain
 .endif
 .ifdef VALUE
   dkim_hash =          VALUE