Fix handling of server which follows a RCPT 452 with a 250. Bug 26092

[exim.git] / test / stderr / 0398

diff --git a/test/stderr/0398 b/test/stderr/0398
index f77cfeee7ace640f9b4e709bc4ccc3e39b496406..d4f6a1c5480167c7750eb6a07ea566fb31633f29 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -52,7 +52,6 @@ expanded list of hosts = '127.0.0.1' options = ''
 set transport t2
 finding IP address for 127.0.0.1
 calling host_find_byname
 set transport t2
 finding IP address for 127.0.0.1
 calling host_find_byname

-host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)

 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 fully qualified name = 127.0.0.1
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 fully qualified name = 127.0.0.1


@@ -63,7 +62,7 @@ remote host address is the local host: remote: configured to try delivery anyway
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL

-  domain_data=remote localpart_data=NULL
+  domain_data=remote local_part_data=NULL

 routed by r2 router
   envelope to: qq@remote
   transport: t2
 routed by r2 router
   envelope to: qq@remote
   transport: t2


@@ -101,7 +100,6 @@ original list of hosts = '127.0.0.1' options = ''
 expanded list of hosts = '127.0.0.1' options = ''
 finding IP address for 127.0.0.1
 calling host_find_byname
 expanded list of hosts = '127.0.0.1' options = ''
 finding IP address for 127.0.0.1
 calling host_find_byname

-host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)

 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 fully qualified name = 127.0.0.1
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 fully qualified name = 127.0.0.1


@@ -112,7 +110,7 @@ remote host address is the local host: remote: configured to try delivery anyway
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL

-  domain_data=remote localpart_data=NULL
+  domain_data=remote local_part_data=NULL

 routed by r2 router
   envelope to: qq@remote
   transport: t2
 routed by r2 router
   envelope to: qq@remote
   transport: t2


@@ -144,7 +142,7 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP>> RCPT TO:<qq@remote>
 cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP>> RCPT TO:<qq@remote>
 cmd buf flush ddd bytes

-sync_responses expect rcpt
+sync_responses expect rcpt for qq@remote

   SMTP<< 550 Unknown
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP<< 550 Unknown
   SMTP>> QUIT
 cmd buf flush ddd bytes


@@ -215,7 +213,6 @@ original list of hosts = '127.0.0.1' options = ''
 expanded list of hosts = '127.0.0.1' options = ''
 finding IP address for 127.0.0.1
 calling host_find_byname
 expanded list of hosts = '127.0.0.1' options = ''
 finding IP address for 127.0.0.1
 calling host_find_byname

-host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)

 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 fully qualified name = 127.0.0.1
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 fully qualified name = 127.0.0.1


@@ -226,7 +223,7 @@ remote host address is the local host: remote: configured to try delivery anyway
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL

-  domain_data=remote localpart_data=NULL
+  domain_data=remote local_part_data=NULL

 routed by r2 router
   envelope to: qq@remote
   transport: t2
 routed by r2 router
   envelope to: qq@remote
   transport: t2