Fix string_copy() macro to not multiple-eval args. Bug 2603

[exim.git] / test / stderr / 0419

diff --git a/test/stderr/0419 b/test/stderr/0419
index 5fc95009cc2a86eb84fb16f40da60d60fb53edd5..ef3ee27bb0557e89dc36746a12b4689627a835db 100644 (file)
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -5,7 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp

-DSN: dnslookup propagating DSN

 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID


@@ -19,10 +18,12 @@ routing k@mxt13.test.ex
 local_part=k domain=mxt13.test.ex
 checking domains
 mxt13.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!mxt13.test.ex")
 local_part=k domain=mxt13.test.ex
 checking domains
 mxt13.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!mxt13.test.ex")

+data from lookup saved for cache for +local_domains: key 'mxt13.test.ex' value 'mxt13.test.ex'

 mxt13.test.ex in "! +local_domains"? yes (end of list)
 calling dnslookup router
 dnslookup router called for k@mxt13.test.ex
   domain = mxt13.test.ex
 mxt13.test.ex in "! +local_domains"? yes (end of list)
 calling dnslookup router
 dnslookup router called for k@mxt13.test.ex
   domain = mxt13.test.ex

+mxt13.test.ex in "*"? yes (matched "*")

 DNS lookup of mxt13.test.ex (MX) using fakens
 DNS lookup of mxt13.test.ex (MX) succeeded
 DNS lookup of other1.test.ex (A) using fakens
 DNS lookup of mxt13.test.ex (MX) using fakens
 DNS lookup of mxt13.test.ex (MX) succeeded
 DNS lookup of other1.test.ex (A) using fakens


@@ -37,16 +38,16 @@ local host in host list - removed hosts:
   other2.test.ex V4NET.12.3.2 5
   other2.test.ex V4NET.12.3.1 5
 fully qualified name = mxt13.test.ex
   other2.test.ex V4NET.12.3.2 5
   other2.test.ex V4NET.12.3.1 5
 fully qualified name = mxt13.test.ex

-host_find_bydns yield = HOST_FOUND (2); returned hosts:
+host_find_bydns yield = HOST_FOUND (3); returned hosts:

   other1.test.ex V4NET.12.4.5 MX=4 
 set transport smtp
 queued for smtp transport: local_part = k
 domain = mxt13.test.ex
   errors_to=NULL
   other1.test.ex V4NET.12.4.5 MX=4 
 set transport smtp
 queued for smtp transport: local_part = k
 domain = mxt13.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=mxt13.test.ex localpart_data=NULL

 routed by dnslookup router
   envelope to: k@mxt13.test.ex
   transport: smtp
 routed by dnslookup router
   envelope to: k@mxt13.test.ex
   transport: smtp

-  host other1.test.ex [V4NET.12.4.5] MX=4
+  host other1.test.ex [V4NET.12.4.5] MX=4 dnssec=no

 search_tidyup called
 search_tidyup called

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