DKIM: fix tolerating spaces round tag values

[users/jgh/exim.git] / test / stderr / 5840

diff --git a/test/stderr/5840 b/test/stderr/5840
index eeffc1103ffcb456ad86614d7a86695e2ae855a3..51962ce6613068926dd6bbe4050d9ddb3508734c 100644 (file)
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -1,3 +1,6 @@
+### TLSA (3 1 1)
+### TLSA (3 1 2)
+### Recipient callout

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -9,23 +12,21 @@
 >>> processing "accept"
 >>> check verify = recipient/callout
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> processing "accept"
 >>> check verify = recipient/callout
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

->>> routing CALLER@dane256ee.test.ex
+>>> routing rcptuser@dane256ee.test.ex

 >>> calling client router
 >>> dane256ee.test.ex in "*"? yes (matched "*")
 >>> local host found for non-MX address
 >>> routed by client router
 >>> Attempting full verification using callout
 >>> calling client router
 >>> dane256ee.test.ex in "*"? yes (matched "*")
 >>> local host found for non-MX address
 >>> routed by client router
 >>> Attempting full verification using callout

->>> callout cache: no domain record found
->>> callout cache: no address record found
+>>> callout cache: no domain record found for dane256ee.test.ex
+>>> callout cache: no address record found for rcptuser@dane256ee.test.ex
+>>> 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
 >>> interface=NULL port=1225
 >>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected

-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)

 >>>   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
 >>>   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex

+>>> cmd buf flush 21 bytes

 >>>   SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
 >>>          250-SIZE 52428800
 >>>          250-8BITMIME
 >>>   SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
 >>>          250-SIZE 52428800
 >>>          250-8BITMIME


@@ -33,31 +34,58 @@ MUNGED: ::1 will be omitted in what follows
 >>>          250-STARTTLS
 >>>          250 HELP
 >>> ip4.ip4.ip4.ip4 in hosts_avoid_tls? no (option unset)
 >>>          250-STARTTLS
 >>>          250 HELP
 >>> ip4.ip4.ip4.ip4 in hosts_avoid_tls? no (option unset)

->>> ip4.ip4.ip4.ip4 in hosts_verify_avoid_tls? no (end of list)
+>>> ip4.ip4.ip4.ip4 in hosts_verify_avoid_tls? no (option unset)

 >>>   SMTP>> STARTTLS
 >>>   SMTP>> STARTTLS

+>>> cmd buf flush 10 bytes

 >>>   SMTP<< 220 TLS go ahead
 >>> ip4.ip4.ip4.ip4 in hosts_require_ocsp? no (option unset)
 >>>   SMTP<< 220 TLS go ahead
 >>> ip4.ip4.ip4.ip4 in hosts_require_ocsp? no (option unset)

->>> ip4.ip4.ip4.ip4 in hosts_request_ocsp? yes (matched "*")

 >>> ip4.ip4.ip4.ip4 in hosts_require_ocsp? no (option unset)
 >>> ip4.ip4.ip4.ip4 in hosts_request_ocsp? no (end of list)
 >>>   SMTP>> EHLO myhost.test.ex
 >>> ip4.ip4.ip4.ip4 in hosts_require_ocsp? no (option unset)
 >>> ip4.ip4.ip4.ip4 in hosts_request_ocsp? no (end of list)
 >>>   SMTP>> EHLO myhost.test.ex

+>>> cmd buf flush 21 bytes

 >>>   SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
 >>>          250-SIZE 52428800
 >>>          250-8BITMIME
 >>>          250-PIPELINING
 >>>          250 HELP
 >>>   SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
 >>>          250-SIZE 52428800
 >>>          250-8BITMIME
 >>>          250-PIPELINING
 >>>          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:<>
 >>> ip4.ip4.ip4.ip4 in hosts_require_auth? no (option unset)
 >>>   SMTP>> MAIL FROM:<>

+>>>   SMTP>> RCPT TO:<rcptuser@dane256ee.test.ex>
+>>> cmd buf flush 52 bytes

 >>>   SMTP<< 250 OK
 >>>   SMTP<< 250 OK

->>>   SMTP>> RCPT TO:<CALLER@dane256ee.test.ex>

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

->>> wrote callout cache domain record:
+>>> cmd buf flush 6 bytes
+>>>   SMTP<< 221 myhost.test.ex closing connection
+>>>   SMTP(close)>>
+>>> wrote callout cache domain record for dane256ee.test.ex:

 >>>   result=1 postmaster=0 random=0
 >>>   result=1 postmaster=0 random=0

->>> wrote positive callout cache address record
+>>> wrote positive callout cache address record for rcptuser@dane256ee.test.ex

 >>> ----------- 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
+### A server with two MXs for which both TLSA lookups return defer
+### 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 ********
 
 ******** SERVER ********

+### TLSA (3 1 1)
+### TLSA (3 1 2)
+### Recipient callout
+### 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, 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)