summaryrefslogtreecommitdiff
path: root/test/confs
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2018-01-06 14:48:35 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2018-01-06 14:48:35 +0000
commit2c47372fad0f829ddfa29d04095f57a70206469c (patch)
tree0f22d80c369d07d359b0ad25f627f6adb347a4b4 /test/confs
parent7952eef9f77899f36b23f1b9fa679f459cd52ffd (diff)
Logging: disable the verbose DKIM verification line by default; add a tag to <= lines.
New log_selector controls "dkim" and "dkim_verbose".
Diffstat (limited to 'test/confs')
-rw-r--r--test/confs/09005
-rw-r--r--test/confs/09066
-rw-r--r--test/confs/45007
-rw-r--r--test/confs/45201
-rw-r--r--test/confs/45501
5 files changed, 19 insertions, 1 deletions
diff --git a/test/confs/0900 b/test/confs/0900
index e02380f73..9a856899a 100644
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -26,7 +26,12 @@ acl_smtp_data = check_data
trusted_users = CALLER
queue_only
smtp_receive_timeout = 2s
+
+.ifdef _HAVE_DKIM
+log_selector = +received_recipients +dkim_verbose
+.else
log_selector = +received_recipients
+.endif
.ifdef _OPT_MAIN_TLS_CERTIFICATE
tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
diff --git a/test/confs/0906 b/test/confs/0906
index 0c7b83d5e..8bb0a9e26 100644
--- a/test/confs/0906
+++ b/test/confs/0906
@@ -19,7 +19,13 @@ primary_hostname = testhost.test.ex
domainlist local_domains = @ : test.ex
acl_smtp_rcpt = acl_r
+
+.ifdef _HAVE_DKIM
+log_selector = +received_recipients +dkim_verbose
+.else
log_selector = +received_recipients
+.endif
+
.ifdef _OPT_MAIN_TLS_CERTIFICATE
tls_certificate = DIR/aux-fixed/cert1
diff --git a/test/confs/4500 b/test/confs/4500
index b53dff5b7..871e0cd22 100644
--- a/test/confs/4500
+++ b/test/confs/4500
@@ -11,6 +11,8 @@ primary_hostname = myhost.test.ex
acl_smtp_rcpt = accept
acl_smtp_dkim = check_dkim
+log_selector = +dkim_verbose
+
queue_only
queue_run_in_order
@@ -28,7 +30,10 @@ check_dkim:
set dkim_verify_status = fail
set dkim_verify_reason = hash too weak
.endif
- accept
+ warn
logwrite = signer: $dkim_cur_signer bits: $dkim_key_length
+.ifndef STRICT
+ accept
+.endif
# End
diff --git a/test/confs/4520 b/test/confs/4520
index 3127d13b3..8515d050d 100644
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -18,6 +18,7 @@ dkim_verify_signers = $dkim_signers : FAKE
DDIR=DIR/aux-fixed/dkim
+log_selector = -dkim +dkim_verbose
# ----- Routers
diff --git a/test/confs/4550 b/test/confs/4550
index 3693d89a6..15178f363 100644
--- a/test/confs/4550
+++ b/test/confs/4550
@@ -14,6 +14,7 @@ acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_lengt
acl_smtp_data_prdr = accept local_parts = okuser
prdr_enable
+log_selector = +dkim_verbose
# ----- Routers