summaryrefslogtreecommitdiff
path: root/test/stderr/5840
diff options
context:
space:
mode:
authorJeremy Harris <jgh@wizmail.org>2017-10-01 15:36:32 +0100
committerJeremy Harris <jgh@wizmail.org>2017-10-01 15:36:32 +0100
commitd5b80e59458182b2d557a929a18cb8c70cd56b68 (patch)
tree1707bd0710e1a37ef5872533ab531dd22b138d6d /test/stderr/5840
parentd5c0d8c9374623620844d539d4810da63e9abca1 (diff)
parente924c08b7d031b712013a7a897e2d430b302fe6c (diff)
Merge branch 'master' into 4.next
Diffstat (limited to 'test/stderr/5840')
-rw-r--r--test/stderr/584025
1 files changed, 14 insertions, 11 deletions
diff --git a/test/stderr/5840 b/test/stderr/5840
index e4cf15c51..51962ce66 100644
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -20,10 +20,7 @@
>>> Attempting full verification using callout
>>> callout cache: no domain record found for dane256ee.test.ex
>>> callout cache: no address record found for rcptuser@dane256ee.test.ex
-MUNGED: ::1 will be omitted in what follows
->>> get[host|ipnode]byname[2] looked up these IP addresses:
->>> name=thishost.test.ex address=127.0.0.1
->>> ip4.ip4.ip4.ip4 in hosts_require_dane? yes (end of list)
+>>> ip4.ip4.ip4.ip4 in hosts_require_dane? yes (matched "ip4.ip4.ip4.ip4")
>>> interface=NULL port=1225
>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected
>>> SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -53,9 +50,9 @@ MUNGED: ::1 will be omitted in what follows
>>> 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>
->>> cmd buf flush 62 bytes
+>>> cmd buf flush 52 bytes
>>> SMTP<< 250 OK
>>> SMTP<< 250 Accepted
>>> SMTP>> QUIT
@@ -68,13 +65,16 @@ MUNGED: ::1 will be omitted in what follows
>>> ----------- 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
### A server with two MXs for which both TLSA lookups return defer
-### A server lacking a TLSA, required
-### A server lacking a TLSA, requested only
+### 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)
@@ -84,5 +84,8 @@ LOG: unexpected disconnection while reading SMTP command from [127.0.0.1]
### A server with a nonverifying cert and no TLSA
### A server with a verifying cert and no TLSA
### A server with two MXs for which both TLSA lookups return defer
-### A server lacking a TLSA, required
-### A server lacking a TLSA, requested only
+### 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)