Use smtp_setup_conn() for verify callout

7 files changed, 19 insertions, 49 deletions

diff --git a/test/stdout/0365 b/test/stdout/0365
index 0d6e07977..f05930041 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/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