Cutthrough: handle request when a callout-hold is active. Bug 2604

[users/heiko/exim.git] / test / stderr / 0398

diff --git a/test/stderr/0398 b/test/stderr/0398
index 4756ab0539c6fecc4f74c1eb43d3374f6fc61955..4756eb62f982b1106e9f62b671f751462bae49fa 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -52,6 +52,7 @@ 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


@@ -62,7 +63,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=NULL localpart_data=NULL
+  domain_data=remote localpart_data=NULL

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


@@ -100,6 +101,7 @@ 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


@@ -110,7 +112,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=NULL localpart_data=NULL
+  domain_data=remote localpart_data=NULL

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


@@ -173,7 +175,6 @@ qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted

-DSN: orcpt: NULL  flags: 0

 SMTP<< rcpt to:<xyz@local>
 using ACL "rcpt"
 processing "deny" (TESTSUITE/test-config 19)
 SMTP<< rcpt to:<xyz@local>
 using ACL "rcpt"
 processing "deny" (TESTSUITE/test-config 19)


@@ -214,6 +215,7 @@ 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


@@ -224,7 +226,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=NULL localpart_data=NULL
+  domain_data=remote localpart_data=NULL

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


@@ -255,7 +257,6 @@ qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted

-DSN: orcpt: NULL  flags: 0

 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN