Testsuite: patchexim now uses /usr/bin/env

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

diff --git a/test/stderr/5840 b/test/stderr/5840
index 556a26bb5ac20ad4fd97f6e79cef51335132701f..97fdca69d9bb82f596a64fc13ec720166606aebf 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,16 +12,16 @@
 >>> 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
 >>> callout cache: no domain record found for 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
 >>> callout cache: no domain record found for dane256ee.test.ex

->>> callout cache: no address record found for CALLER@dane256ee.test.ex
+>>> callout cache: no address record found for rcptuser@dane256ee.test.ex

 >>> interface=NULL port=1225
 >>> interface=NULL port=1225

->>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... >>> connected
+>>> 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
 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


@@ -52,18 +55,34 @@ MUNGED: ::1 will be omitted in what follows
 >>>   SMTP>> MAIL FROM:<>
 >>> cmd buf flush 14 bytes
 >>>   SMTP<< 250 OK
 >>>   SMTP>> MAIL FROM:<>
 >>> cmd buf flush 14 bytes
 >>>   SMTP<< 250 OK

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

 >>> cmd buf flush 38 bytes
 >>>   SMTP<< 250 Accepted
 >>>   SMTP>> QUIT
 >>> cmd buf flush 6 bytes
 >>> cmd buf flush 38 bytes
 >>>   SMTP<< 250 Accepted
 >>>   SMTP>> QUIT
 >>> 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
 >>>   SMTP(close)>>
 >>> wrote callout cache domain record for dane256ee.test.ex:
 >>>   result=1 postmaster=0 random=0

->>> wrote positive callout cache address record for CALLER@dane256ee.test.ex
+>>> 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
 LOG: unexpected disconnection while reading SMTP command from [127.0.0.1]
 >>> ----------- 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]

+### 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

 
 ******** 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, required
+### A server lacking a TLSA, requested only