Fix $local_part_verified for remote-delivery routing following local. Bug 2565

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

diff --git a/test/stderr/0161 b/test/stderr/0161
index 6b1f5796b00c8f671acc73df77d76d7765d0be8a..53317177bcaa1a95fb6fd4951fd6b7ce46ef8b93 100644 (file)
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -1,6 +1,7 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+dropping to exim gid; retaining priv uid

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt6.test.ex
 --------> failuphost router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt6.test.ex
 --------> failuphost router <--------


@@ -22,11 +23,12 @@ domain = mxt6.test.ex
 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

-  host ten-1.test.ex [V4NET.0.0.1] MX=5
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+  host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+dropping to exim gid; retaining priv uid

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing myhost.test.ex@mxt1.test.ex
 --------> failuphost router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing myhost.test.ex@mxt1.test.ex
 --------> failuphost router <--------


@@ -55,8 +57,8 @@ calling self router
 self router called for myhost.test.ex@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname
 self router called for myhost.test.ex@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname

-original list of hosts = "$local_part" options = byname
-expanded list of hosts = "myhost.test.ex" options = byname
+original list of hosts = '$local_part' options = 'byname'
+expanded list of hosts = 'myhost.test.ex' options = 'byname'

 set transport remote_smtp
 finding IP address for myhost.test.ex
 calling host_find_byname
 set transport remote_smtp
 finding IP address for myhost.test.ex
 calling host_find_byname


@@ -68,10 +70,11 @@ routed by self router
   envelope to: myhost.test.ex@mxt1.test.ex
   transport: remote_smtp
   host myhost.test.ex [V4NET.10.10.10]
   envelope to: myhost.test.ex@mxt1.test.ex
   transport: remote_smtp
   host myhost.test.ex [V4NET.10.10.10]

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+dropping to exim gid; retaining priv uid

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt1.test.ex
 --------> failuphost router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt1.test.ex
 --------> failuphost router <--------


@@ -100,8 +103,8 @@ calling self router
 self router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname
 self router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname

-original list of hosts = "$local_part" options = byname
-expanded list of hosts = "xx" options = byname
+original list of hosts = '$local_part' options = 'byname'
+expanded list of hosts = 'xx' options = 'byname'

 set transport remote_smtp
 finding IP address for xx
 calling host_find_byname
 set transport remote_smtp
 finding IP address for xx
 calling host_find_byname


@@ -114,8 +117,8 @@ calling self2 router
 self2 router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * myhost.test.ex byname
 self2 router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * myhost.test.ex byname

-original list of hosts = "myhost.test.ex" options = byname
-expanded list of hosts = "myhost.test.ex" options = byname
+original list of hosts = 'myhost.test.ex' options = 'byname'
+expanded list of hosts = 'myhost.test.ex' options = 'byname'

 set transport remote_smtp
 finding IP address for myhost.test.ex
 calling host_find_byname
 set transport remote_smtp
 finding IP address for myhost.test.ex
 calling host_find_byname


@@ -127,30 +130,32 @@ routed by self2 router
   envelope to: xx@mxt1.test.ex
   transport: remote_smtp
   host myhost.test.ex [V4NET.10.10.10]
   envelope to: xx@mxt1.test.ex
   transport: remote_smtp
   host myhost.test.ex [V4NET.10.10.10]

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 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
 "more" is false: skipping remaining routers
 no more routers

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+dropping to exim gid; retaining priv uid

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing ff@mxt1.test.ex
 --------> failuphost router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing ff@mxt1.test.ex
 --------> failuphost router <--------


@@ -162,10 +167,11 @@ failuphost router called for ff@mxt1.test.ex
   domain = mxt1.test.ex
 lowest numbered MX record points to local host: mxt1.test.ex: address failed (self = fail)
 failuphost router forced address failure
   domain = mxt1.test.ex
 lowest numbered MX record points to local host: mxt1.test.ex: address failed (self = fail)
 failuphost router forced address failure

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+dropping to exim gid; retaining priv uid

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing fff@mxt1.test.ex
 --------> failuphost router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing fff@mxt1.test.ex
 --------> failuphost router <--------


@@ -190,10 +196,10 @@ calling fail router
 fail router called for fff@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname
 fail router called for fff@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname

-original list of hosts = "$local_part" options = byname
-expanded list of hosts = "fff" options = byname
+original list of hosts = '$local_part' options = 'byname'
+expanded list of hosts = 'fff' options = 'byname'

 set transport remote_smtp
 finding IP address for fff
 calling host_find_byname
 fail router forced address failure
 set transport remote_smtp
 finding IP address for fff
 calling host_find_byname
 fail router forced address failure

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>