Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / stdout / 4216

diff --git a/test/stdout/4216 b/test/stdout/4216
index 9194ebc41b0e4bebda3dd7ed0a002fb6a4d233ea..fda7256be6b6ea39a402c6ed54102d9a840d0ddb 100644 (file)
--- a/test/stdout/4216
+++ b/test/stdout/4216
@@ -33,13 +33,8 @@
 250-SMTPUTF8\r
 250 HELP\r
 250 OK\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
 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


@@ -51,12 +46,7 @@
 250-SMTPUTF8\r
 250 HELP\r
 250 OK\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