Merge branch 'callout_smtp_tpt_merge'

12 files changed, 510 insertions, 56 deletions

diff --git a/test/stdout/0211 b/test/stdout/0211
index 93e271c6a..2d484bda5 100644
--- a/test/stdout/0211
+++ b/test/stdout/0211
@@ -22,7 +22,7 @@ Connection request from [127.0.0.1]
 End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
-550 Go away
+550 Go away (A)
 QUIT
 250 OK
 End of script
@@ -30,9 +30,9 @@ Listening on port 1224 ...
 Connection request from [127.0.0.1]
 220 Connected OK
 EHLO the.local.host.name
-550 Go away
+550 Go away (B)
 HELO the.local.host.name
-550 Go away
+550 Go away (C)
 QUIT
 250 OK
 End of script
diff --git a/test/stdout/0227 b/test/stdout/0227
index d63f14e90..ea8520ef1 100644
--- a/test/stdout/0227
+++ b/test/stdout/0227
@@ -251,7 +251,7 @@ EHLO myhost.test.ex
 250- wotcher
 250-SIZE
 250 OK
-MAIL FROM:<>
+MAIL FROM:<> SIZE=ssss
 250 OK
 RCPT TO:<ok@localhost1>
 250 OK
diff --git a/test/stdout/0365 b/test/stdout/0365
index 0d6e07977..cdceac47e 100644
--- a/test/stdout/0365
+++ b/test/stdout/0365
@@ -40,7 +40,7 @@
 550-Rejected after DATA: could not verify "From:" header address

 550 bad@domain: Unrouteable address

 250 OK

-451-could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error

+451-Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : could not connect: Network Error

 451-Could not complete sender verify callout for <callout@x>.

 451-The mail server(s) for the domain may be temporarily unreachable, or

 451-they may be permanently unreachable from this server. In the latter case,

diff --git a/test/stdout/0376 b/test/stdout/0376
index a0af2cb92..8c2b9685c 100644
--- a/test/stdout/0376
+++ b/test/stdout/0376
@@ -78,7 +78,7 @@
 221 myhost.test.ex closing connection

 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250 OK

-250 Accepted

+451 Could not complete sender verify callout

 221 myhost.test.ex closing connection

 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250 OK

@@ -86,7 +86,7 @@
 221 myhost.test.ex closing connection

 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250 OK

-250 Accepted

+451 Could not complete sender verify callout

 221 myhost.test.ex closing connection

 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250 OK

diff --git a/test/stdout/0473 b/test/stdout/0473
index 59ed36d6a..6199bf9bc 100644
--- a/test/stdout/0473
+++ b/test/stdout/0473
@@ -92,6 +92,7 @@
 250 Accepted

 221 the.local.host.name closing connection

 +++++++++++++++++++++++++++
+07-Mar-2000 12:21:52 other.ex callout=accept postmaster=unknown random=unknown
 07-Mar-2000 12:21:52 r1@test.ex callout=accept
 07-Mar-2000 12:21:52 r1@test.ex/<postmaster@the.local.host.name> callout=accept
 07-Mar-2000 12:21:52 r1@test.ex/<s1@test.ex> callout=accept
@@ -110,6 +111,7 @@
 250 Accepted

 221 the.local.host.name closing connection

 +++++++++++++++++++++++++++
+07-Mar-2000 12:21:52 other.ex callout=accept postmaster=unknown random=unknown
 07-Mar-2000 12:21:52 r12@three.test.ex callout=accept
 07-Mar-2000 12:21:52 r1@test.ex callout=accept
 07-Mar-2000 12:21:52 r1@test.ex/<postmaster@the.local.host.name> callout=accept
@@ -251,7 +253,7 @@ EHLO the.local.host.name
 250 OK
 MAIL FROM:<>
 250 OK
-RCPT TO:<r12@three.test.ex>
+RCPT TO:<the.local.host.name--testing@three.test.ex>
 250 OK
 QUIT
 250 OK
diff --git a/test/stdout/0578 b/test/stdout/0578
new file mode 100644
index 000000000..40b265041
--- /dev/null
+++ b/test/stdout/0578
@@ -0,0 +1,482 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+451 Could not complete sender verify callout

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+550-Verification failed for <bad@localhost>

+550-Called:   127.0.0.1

+550-Sent:     RCPT TO:<bad@localhost>

+550-Response: 550 REJECTED rcpt

+550 Sender verify failed

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+550-Verification failed for <bad@localhost>

+550-Previous (cached) callout verification failure

+550 Sender verify failed

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+550-Callback setup failed while verifying <ok@localhost>

+550-Called:   127.0.0.1

+550-Sent:     MAIL FROM:<>

+550-Response: 550 REJECT mail from

+550-The initial connection, or a HELO or MAIL FROM:<> command was

+550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards

+550-RFC requirements, and stops you from receiving standard bounce

+550-messages. This host does not accept mail from domains whose servers

+550-refuse bounces.

+550 Sender verify failed

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+550-Callback setup failed while verifying <ok@localhost>

+550-(result of an earlier callout reused).

+550-The initial connection, or a HELO or MAIL FROM:<> command was

+550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards

+550-RFC requirements, and stops you from receiving standard bounce

+550-messages. This host does not accept mail from domains whose servers

+550-refuse bounces.

+550 Sender verify failed

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+550-Postmaster verification failed while checking <ok@otherhost>

+550-Called:   127.0.0.1

+550-Sent:     RCPT TO:<postmaster@otherhost>

+550-Response: 550 NOT OK rcpt postmaster

+550-Several RFCs state that you are required to have a postmaster

+550-mailbox for each mail domain. This host does not accept mail

+550-from domains whose servers reject the postmaster address.

+550 Sender verify failed

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+550-Postmaster verification failed while checking <ok@otherhost>

+550-(result of earlier verification reused).

+550-Several RFCs state that you are required to have a postmaster

+550-mailbox for each mail domain. This host does not accept mail

+550-from domains whose servers reject the postmaster address.

+550 Sender verify failed

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+451 Could not complete sender verify callout

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+451 Could not complete sender verify callout

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+451 Could not complete sender verify callout

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+354 Enter message, ending with "." on a line by itself

+250 OK id=10HmaX-0005vi-00

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+354 Enter message, ending with "." on a line by itself

+250 OK id=10HmaY-0005vi-00

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+221 myhost.test.ex closing connection

+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<ok@localhost>
+250 OK mail sender
+250 OK recipient
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<bad@localhost>
+250 OK sender
+550 REJECTED rcpt
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<ok@localhost>
+550 REJECT mail from
+530 BAD SEQUENCE no sender accepted for rcpt
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<ok@otherhost>
+250 OK sender
+250 OK rcpt
+RSET
+250 OK reset
+MAIL FROM:<>
+RCPT TO:<postmaster@otherhost>
+250 OK sender
+550 NOT OK rcpt postmaster
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<ok@otherhost2>
+250 OK
+250 OK
+RSET
+250 OK
+MAIL FROM:<>
+RCPT TO:<postmaster@otherhost2>
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost3>
+250 OK
+250 OK accepting that random recipient
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost4>
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost41>
+250 OK
+550 NOT OK
+RSET
+250 OK
+MAIL FROM:<>
+RCPT TO:<ok@otherhost41>
+250 OK
+250 OK
+RSET
+250 OK
+MAIL FROM:<>
+RCPT TO:<postmaster@otherhost41>
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<ok@otherhost21>
+250 OK
+250 OK
+RSET
+250 OK
+MAIL FROM:<>
+RCPT TO:<postmaster@otherhost21>
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<ok2@otherhost21>
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost31>
+250 OK
+550 NOT OK
+RSET
+250 OK
+MAIL FROM:<>
+RCPT TO:<ok@otherhost31>
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<okok@otherhost31>
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost31>
+250 OK
+550 NOT OK
+RSET
+250 OK
+MAIL FROM:<>
+RCPT TO:<okokok@otherhost31>
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+250 OK
+*sleep 2
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<okokok@otherhost52>
+250 OK
+250 OK
+RSET
+250 OK
+MAIL FROM:<pmsend@a.domain>
+RCPT TO:<postmaster@otherhost52>
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<somesender@a.domain>
+RCPT TO:<abcd@x.y.z>
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<abcd@x.y.z>
+250 OK
+*sleep 2
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+RCPT TO:<ok@otherhost9>
+250 OK
+250 OK
+RSET
+250 OK
+MAIL FROM:<>
+RCPT TO:<postmaster@otherhost9>
+250 OK
+550 NOT OK
+RCPT TO:<postmaster>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-Yeah mate
+250-PIPELINING
+250 OK
+MAIL FROM:<postmaster@myhost.test.ex>
+RCPT TO:<myhost.test.ex-dddddddd-testing@test.ex>
+250 OK
+550 RANDOM IS BAD
+RSET
+250 OK
+MAIL FROM:<postmaster@myhost.test.ex>
+RCPT TO:<z@test.ex>
+250 OK
+250 OK
+RSET
+250 OK
+MAIL FROM:<pmsend@b.domain>
+RCPT TO:<postmaster@test.ex>
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/4204 b/test/stdout/4204
index 6944afbe0..0f9825128 100644
--- a/test/stdout/4204
+++ b/test/stdout/4204
@@ -30,7 +30,7 @@
 250-SMTPUTF8

 250 HELP

 250 OK

-533 mailbox name not allowed

+533 no support for internationalised mailbox name

 221 the.local.host.name closing connection

 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250-the.local.host.name Hello CALLER at client.ffail

@@ -40,5 +40,5 @@
 250-SMTPUTF8

 250 HELP

 250 OK

-533 mailbox name not allowed

+533 no support for internationalised mailbox name

 221 the.local.host.name closing connection

diff --git a/test/stdout/4206 b/test/stdout/4206
index a88d667d5..057ddb3aa 100644
--- a/test/stdout/4206
+++ b/test/stdout/4206
@@ -30,13 +30,8 @@
 250-SMTPUTF8

 250 HELP

 250 OK

-550-Callback setup failed while verifying <userA@test.ex>

-550-533 mailbox name not allowed

-550-The initial connection, or a HELO or MAIL FROM:<> command was

-550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards

-550-RFC requirements, and stops you from receiving standard bounce

-550-messages. This host does not accept mail from domains whose servers

-550-refuse bounces.

+550-Verification failed for <userA@test.ex>

+550-533 no support for internationalised mailbox name

 550 Sender verify failed

 221 the.local.host.name closing connection

 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

@@ -47,12 +42,7 @@
 250-SMTPUTF8

 250 HELP

 250 OK

-550-Callback setup failed while verifying <userB.જેઠીમધ@test.ex>

-550-533 mailbox name not allowed

-550-The initial connection, or a HELO or MAIL FROM:<> command was

-550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards

-550-RFC requirements, and stops you from receiving standard bounce

-550-messages. This host does not accept mail from domains whose servers

-550-refuse bounces.

+550-Verification failed for <userB.જેઠીમધ@test.ex>

+550-533 no support for internationalised mailbox name

 550 Sender verify failed

 221 the.local.host.name closing connection

diff --git a/test/stdout/4214 b/test/stdout/4214
index 01f10201b..211eedac7 100644
--- a/test/stdout/4214
+++ b/test/stdout/4214
@@ -33,7 +33,7 @@
 250-SMTPUTF8

 250 HELP

 250 OK

-533 mailbox name not allowed

+533 no support for internationalised mailbox name

 221 the.local.host.name closing connection

 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250-the.local.host.name Hello CALLER at client.ffail

@@ -44,5 +44,5 @@
 250-SMTPUTF8

 250 HELP

 250 OK

-533 mailbox name not allowed

+533 no support for internationalised mailbox name

 221 the.local.host.name closing connection

diff --git a/test/stdout/4216 b/test/stdout/4216
index 9194ebc41..fda7256be 100644
--- a/test/stdout/4216
+++ b/test/stdout/4216
@@ -33,13 +33,8 @@
 250-SMTPUTF8

 250 HELP

 250 OK

-550-Callback setup failed while verifying <userA@test.ex>

-550-533 mailbox name not allowed

-550-The initial connection, or a HELO or MAIL FROM:<> command was

-550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards

-550-RFC requirements, and stops you from receiving standard bounce

-550-messages. This host does not accept mail from domains whose servers

-550-refuse bounces.

+550-Verification failed for <userA@test.ex>

+550-533 no support for internationalised mailbox name

 550 Sender verify failed

 221 the.local.host.name closing connection

 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

@@ -51,12 +46,7 @@
 250-SMTPUTF8

 250 HELP

 250 OK

-550-Callback setup failed while verifying <userB.જેઠીમધ@test.ex>

-550-533 mailbox name not allowed

-550-The initial connection, or a HELO or MAIL FROM:<> command was

-550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards

-550-RFC requirements, and stops you from receiving standard bounce

-550-messages. This host does not accept mail from domains whose servers

-550-refuse bounces.

+550-Verification failed for <userB.જેઠીમધ@test.ex>

+550-533 no support for internationalised mailbox name

 550 Sender verify failed

 221 the.local.host.name closing connection

diff --git a/test/stdout/4224 b/test/stdout/4224
index 01f10201b..211eedac7 100644
--- a/test/stdout/4224
+++ b/test/stdout/4224
@@ -33,7 +33,7 @@
 250-SMTPUTF8

 250 HELP

 250 OK

-533 mailbox name not allowed

+533 no support for internationalised mailbox name

 221 the.local.host.name closing connection

 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250-the.local.host.name Hello CALLER at client.ffail

@@ -44,5 +44,5 @@
 250-SMTPUTF8

 250 HELP

 250 OK

-533 mailbox name not allowed

+533 no support for internationalised mailbox name

 221 the.local.host.name closing connection

diff --git a/test/stdout/4226 b/test/stdout/4226
index 9194ebc41..fda7256be 100644
--- a/test/stdout/4226
+++ b/test/stdout/4226
@@ -33,13 +33,8 @@
 250-SMTPUTF8

 250 HELP

 250 OK

-550-Callback setup failed while verifying <userA@test.ex>

-550-533 mailbox name not allowed

-550-The initial connection, or a HELO or MAIL FROM:<> command was

-550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards

-550-RFC requirements, and stops you from receiving standard bounce

-550-messages. This host does not accept mail from domains whose servers

-550-refuse bounces.

+550-Verification failed for <userA@test.ex>

+550-533 no support for internationalised mailbox name

 550 Sender verify failed

 221 the.local.host.name closing connection

 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

@@ -51,12 +46,7 @@
 250-SMTPUTF8

 250 HELP

 250 OK

-550-Callback setup failed while verifying <userB.જેઠીમધ@test.ex>

-550-533 mailbox name not allowed

-550-The initial connection, or a HELO or MAIL FROM:<> command was

-550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards

-550-RFC requirements, and stops you from receiving standard bounce

-550-messages. This host does not accept mail from domains whose servers

-550-refuse bounces.

+550-Verification failed for <userB.જેઠીમધ@test.ex>

+550-533 no support for internationalised mailbox name

 550 Sender verify failed

 221 the.local.host.name closing connection