TLS: harden error-detection in TLS proxy process

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

diff --git a/test/stderr/0161 b/test/stderr/0161
index 9ace15fd1edfa193dc8c505def5980000bf298f1..6a8449d8d9e68fb3fee03d409108c899097f353d 100644 (file)
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -19,7 +19,7 @@ set transport remote_smtp
 queued for remote_smtp transport: local_part = xx
 domain = mxt6.test.ex
   errors_to=NULL
 queued for remote_smtp transport: local_part = xx
 domain = mxt6.test.ex
   errors_to=NULL

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

 routed by lookuphost router
   envelope to: xx@mxt6.test.ex
   transport: remote_smtp
 routed by lookuphost router
   envelope to: xx@mxt6.test.ex
   transport: remote_smtp


@@ -65,7 +65,7 @@ calling host_find_byname
 queued for remote_smtp transport: local_part = myhost.test.ex
 domain = mxt1.test.ex
   errors_to=NULL
 queued for remote_smtp transport: local_part = myhost.test.ex
 domain = mxt1.test.ex
   errors_to=NULL

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

 routed by self router
   envelope to: myhost.test.ex@mxt1.test.ex
   transport: remote_smtp
 routed by self router
   envelope to: myhost.test.ex@mxt1.test.ex
   transport: remote_smtp


@@ -125,7 +125,7 @@ calling host_find_byname
 queued for remote_smtp transport: local_part = xx
 domain = mxt1.test.ex
   errors_to=NULL
 queued for remote_smtp transport: local_part = xx
 domain = mxt1.test.ex
   errors_to=NULL

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

 routed by self2 router
   envelope to: xx@mxt1.test.ex
   transport: remote_smtp
 routed by self2 router
   envelope to: xx@mxt1.test.ex
   transport: remote_smtp


@@ -136,19 +136,19 @@ configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

-routing xx@not.exist
+routing xx@not-exist.test.ex

 --------> failuphost router <--------
 --------> failuphost router <--------

-local_part=xx domain=not.exist
+local_part=xx domain=not-exist.test.ex

 checking domains
 checking local_parts
 failuphost router skipped: local_parts mismatch
 --------> lookuphost router <--------
 checking domains
 checking local_parts
 failuphost router skipped: local_parts mismatch
 --------> lookuphost router <--------

-local_part=xx domain=not.exist
+local_part=xx domain=not-exist.test.ex

 checking domains
 calling lookuphost router
 checking domains
 calling lookuphost router

-lookuphost router called for xx@not.exist
-  domain = not.exist
-lookuphost router declined for xx@not.exist
+lookuphost router called for xx@not-exist.test.ex
+  domain = not-exist.test.ex
+lookuphost router declined for xx@not-exist.test.ex

 "more" is false: skipping remaining routers
 no more routers
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
 "more" is false: skipping remaining routers
 no more routers
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>