Merge branch 'SMTPUTF8_1516'. Bug 1516

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

diff --git a/test/stderr/0381 b/test/stderr/0381
index a026767b8777dbbca7a1f34ddb01b56dcf073deb..a24ef419f75bc7a4b641edfed2382a9824b6a11e 100644 (file)
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -37,8 +37,8 @@ sender host name required, to match against *.gov.uk.test.ex
 looking up host name for V4NET.99.99.97
 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
 looking up host name for V4NET.99.99.97
 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
+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
 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


@@ -58,22 +58,24 @@ checking addresses for x.co.uk.test.ex
 sender_fullhost = x.gov.uk.test.ex [V4NET.99.99.97]
 sender_rcvhost = x.gov.uk.test.ex ([V4NET.99.99.97] ident=CALLER)
 host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
 sender_fullhost = x.gov.uk.test.ex [V4NET.99.99.97]
 sender_rcvhost = x.gov.uk.test.ex ([V4NET.99.99.97] ident=CALLER)
 host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")

-warn: condition test succeeded
+warn: condition test succeeded in ACL "check_rcpt"

 processing "warn"
 check hosts = !*.gov.uk.test.ex
 host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")
 processing "warn"
 check hosts = !*.gov.uk.test.ex
 host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")

-warn: condition test failed
+warn: condition test failed in ACL "check_rcpt"

 processing "warn"
 check hosts = *.co.uk.test.ex
 host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")
 processing "warn"
 check hosts = *.co.uk.test.ex
 host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")

-warn: condition test succeeded
+warn: condition test succeeded in ACL "check_rcpt"

 processing "warn"
 check hosts = !*.co.uk.test.ex
 host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")
 processing "warn"
 check hosts = !*.co.uk.test.ex
 host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")

-warn: condition test failed
+warn: condition test failed in ACL "check_rcpt"

 processing "accept"
 processing "accept"

-accept: condition test succeeded
+accept: condition test succeeded in ACL "check_rcpt"
+end of ACL "check_rcpt": ACCEPT

 SMTP>> 250 Accepted
 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