Logging: support +outgoing_port on defer lines and per-host error lines

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

diff --git a/test/stderr/0381 b/test/stderr/0381
index c1ead3f60926593d28f2e0bbc1412eef8a54f660..d5e9ee6fce2d4422b823e2f3a60cda5f62a9b104 100644 (file)
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -39,21 +39,17 @@ DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) succeeded
 IP address lookup yielded "x.gov.uk.test.ex"
   alias "x.co.uk.test.ex"
 DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) succeeded
 IP address lookup yielded "x.gov.uk.test.ex"
   alias "x.co.uk.test.ex"

-using host_fake_gethostbyname for x.gov.uk.test.ex (IPv4)

 DNS lookup of x.gov.uk.test.ex (A) using fakens
 DNS lookup of x.gov.uk.test.ex (A) succeeded
 DNS lookup of x.gov.uk.test.ex (A) using fakens
 DNS lookup of x.gov.uk.test.ex (A) succeeded

-MUNGED: ::1 will be omitted in what follows
-get[host|ipnode]byname[2] looked up these IP addresses:
-  name=x.gov.uk.test.ex address=V4NET.99.99.97
+x.gov.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 

 checking addresses for x.gov.uk.test.ex
 checking addresses for x.gov.uk.test.ex

+Forward DNS security status: unverified

   V4NET.99.99.97 OK
   V4NET.99.99.97 OK

-using host_fake_gethostbyname for x.co.uk.test.ex (IPv4)

 DNS lookup of x.co.uk.test.ex (A) using fakens
 DNS lookup of x.co.uk.test.ex (A) succeeded
 DNS lookup of x.co.uk.test.ex (A) using fakens
 DNS lookup of x.co.uk.test.ex (A) succeeded

-MUNGED: ::1 will be omitted in what follows
-get[host|ipnode]byname[2] looked up these IP addresses:
-  name=x.co.uk.test.ex address=V4NET.99.99.97
+x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 

 checking addresses for x.co.uk.test.ex
 checking addresses for x.co.uk.test.ex

+Forward DNS security status: unverified

   V4NET.99.99.97 OK
 sender_fullhost = x.gov.uk.test.ex [V4NET.99.99.97]
 sender_rcvhost = x.gov.uk.test.ex ([V4NET.99.99.97] ident=CALLER)
   V4NET.99.99.97 OK
 sender_fullhost = x.gov.uk.test.ex [V4NET.99.99.97]
 sender_rcvhost = x.gov.uk.test.ex ([V4NET.99.99.97] ident=CALLER)


@@ -75,6 +71,7 @@ processing "accept"
 accept: condition test succeeded in ACL "check_rcpt"
 end of ACL "check_rcpt": ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in ACL "check_rcpt"
 end of ACL "check_rcpt": ACCEPT
 SMTP>> 250 Accepted

+DSN: orcpt: NULL  flags: 0

 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN