Transactions in retry hintsdb

[exim.git] / test / stdout / 4226

diff --git a/test/stdout/4226 b/test/stdout/4226
index 9194ebc41b0e4bebda3dd7ed0a002fb6a4d233ea..20391e5115f50a741434831b0a08c87ac95df475 100644 (file)
--- a/test/stdout/4226
+++ b/test/stdout/4226
@@ -1,6 +1,7 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-the.local.host.name Hello CALLER at client.bh\r
 250-SIZE 52428800\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-the.local.host.name Hello CALLER at client.bh\r
 250-SIZE 52428800\r

+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r

 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r


@@ -9,11 +10,12 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmaX-0005vi-00\r
+250 OK id=10HmaX-000000005vi-0000\r

 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-the.local.host.name Hello CALLER at client.bh\r
 250-SIZE 52428800\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-the.local.host.name Hello CALLER at client.bh\r
 250-SIZE 52428800\r

+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r

 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r


@@ -22,41 +24,33 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmaZ-0005vi-00\r
+250 OK id=10HmaZ-000000005vi-0000\r

 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-the.local.host.name Hello CALLER at client.sfail\r
 250-SIZE 52428800\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-the.local.host.name Hello CALLER at client.sfail\r
 250-SIZE 52428800\r

+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r

 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
 250-SMTPUTF8\r
 250 HELP\r
 250 OK\r
 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
 250-SMTPUTF8\r
 250 HELP\r
 250 OK\r

-550-Callback setup failed while verifying <userA@test.ex>\r
-550-533 mailbox name not allowed\r
-550-The initial connection, or a HELO or MAIL FROM:<> command was\r
-550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards\r
-550-RFC requirements, and stops you from receiving standard bounce\r
-550-messages. This host does not accept mail from domains whose servers\r
-550-refuse bounces.\r
+550-Verification failed for <userA@test.ex>\r
+550-533 no support for internationalised mailbox name\r

 550 Sender verify failed\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-the.local.host.name Hello CALLER at client.sfail\r
 250-SIZE 52428800\r
 550 Sender verify failed\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-the.local.host.name Hello CALLER at client.sfail\r
 250-SIZE 52428800\r

+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r

 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
 250-SMTPUTF8\r
 250 HELP\r
 250 OK\r
 250-8BITMIME\r
 250-PIPELINING\r
 250-STARTTLS\r
 250-SMTPUTF8\r
 250 HELP\r
 250 OK\r

-550-Callback setup failed while verifying <userB.જેઠીમધ@test.ex>\r
-550-533 mailbox name not allowed\r
-550-The initial connection, or a HELO or MAIL FROM:<> command was\r
-550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards\r
-550-RFC requirements, and stops you from receiving standard bounce\r
-550-messages. This host does not accept mail from domains whose servers\r
-550-refuse bounces.\r
+550-Verification failed for <userB.જેઠીમધ@test.ex>\r
+550-533 no support for internationalised mailbox name\r

 550 Sender verify failed\r
 221 the.local.host.name closing connection\r
 550 Sender verify failed\r
 221 the.local.host.name closing connection\r