DKIM: Allow the DKIM ACL to override verification results. Bug 2186

[exim.git] / test / stderr / 5840

diff --git a/test/stderr/5840 b/test/stderr/5840
index 75f938ab4ba2d5f8a60d9959c441c3883f8f5a36..51962ce6613068926dd6bbe4050d9ddb3508734c 100644 (file)
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -50,9 +50,9 @@
 >>>          250 HELP
 >>> ip4.ip4.ip4.ip4 in hosts_avoid_pipelining? no (option unset)
 >>> ip4.ip4.ip4.ip4 in hosts_require_auth? no (option unset)
 >>>          250 HELP
 >>> ip4.ip4.ip4.ip4 in hosts_avoid_pipelining? no (option unset)
 >>> ip4.ip4.ip4.ip4 in hosts_require_auth? no (option unset)

->>>   SMTP>> MAIL FROM:<> SIZE=ssss
+>>>   SMTP>> MAIL FROM:<>

 >>>   SMTP>> RCPT TO:<rcptuser@dane256ee.test.ex>
 >>>   SMTP>> RCPT TO:<rcptuser@dane256ee.test.ex>

->>> cmd buf flush 62 bytes
+>>> cmd buf flush 52 bytes

 >>>   SMTP<< 250 OK
 >>>   SMTP<< 250 Accepted
 >>>   SMTP>> QUIT
 >>>   SMTP<< 250 OK
 >>>   SMTP<< 250 Accepted
 >>>   SMTP>> QUIT


@@ -65,7 +65,7 @@
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT

-LOG: unexpected disconnection while reading SMTP command from [127.0.0.1]
+LOG: unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs

 ### TLSA (2 0 1)
 ### A server with a nonverifying cert and no TLSA
 ### A server with a verifying cert and no TLSA
 ### TLSA (2 0 1)
 ### A server with a nonverifying cert and no TLSA
 ### A server with a verifying cert and no TLSA


@@ -73,6 +73,8 @@ LOG: unexpected disconnection while reading SMTP command from [127.0.0.1]
 ### A server lacking a TLSA, dane required (should fail)
 ### A server lacking a TLSA, dane requested only (should fail, as the NXDOMAIN is not DNSSEC)
 ### A server where the A is dnssec and the TLSA _fails_
 ### A server lacking a TLSA, dane required (should fail)
 ### A server lacking a TLSA, dane requested only (should fail, as the NXDOMAIN is not DNSSEC)
 ### A server where the A is dnssec and the TLSA _fails_

+### A server securely saying "no TLSA records here", dane required (should fail)
+### A server securely saying "no TLSA records here", dane requested only (should transmit)

 
 ******** SERVER ********
 ### TLSA (3 1 1)
 
 ******** SERVER ********
 ### TLSA (3 1 1)


@@ -85,3 +87,5 @@ LOG: unexpected disconnection while reading SMTP command from [127.0.0.1]
 ### A server lacking a TLSA, dane required (should fail)
 ### A server lacking a TLSA, dane requested only (should fail, as the NXDOMAIN is not DNSSEC)
 ### A server where the A is dnssec and the TLSA _fails_
 ### A server lacking a TLSA, dane required (should fail)
 ### A server lacking a TLSA, dane requested only (should fail, as the NXDOMAIN is not DNSSEC)
 ### A server where the A is dnssec and the TLSA _fails_

+### A server securely saying "no TLSA records here", dane required (should fail)
+### A server securely saying "no TLSA records here", dane requested only (should transmit)