Merge branch 'master' into 4.next

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

diff --git a/test/stderr/0545 b/test/stderr/0545
index cfe6a114e84280fa39413965dc1aeaeb6e3a48fd..99cf67821d287bc588084bc0a482bfb2cc8bc008 100644 (file)
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -3,6 +3,7 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
+DSN: dns propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@the.local.host.name
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -23,8 +24,6 @@ CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (MX) using fakens
 DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
-DNS lookup of alias-eximtesthost (AAAA) succeeded
-CNAME found: change to eximtesthost.test.ex
 DNS lookup of alias-eximtesthost (A) using fakens
 DNS lookup of alias-eximtesthost (A) succeeded
 CNAME found: change to eximtesthost.test.ex
@@ -49,9 +48,6 @@ DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
 DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex-MX: using cached value DNS_NODATA
-DNS lookup of alias-eximtesthost.test.ex (AAAA) succeeded
-CNAME found: change to eximtesthost.test.ex
-DNS lookup of eximtesthost.test.ex-AAAA: using cached value DNS_NODATA
 DNS lookup of alias-eximtesthost.test.ex (A) using fakens
 DNS lookup of alias-eximtesthost.test.ex (A) succeeded
 CNAME found: change to eximtesthost.test.ex
@@ -71,12 +67,13 @@ routed by dns router
   transport: smtp
   host eximtesthost.test.ex [ip4.ip4.ip4.ip4]
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
+DSN: dns propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@the.local.host.name
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -97,8 +94,6 @@ CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (MX) using fakens
 DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
-DNS lookup of alias-eximtesthost.test.ex (AAAA) succeeded
-CNAME found: change to eximtesthost.test.ex
 DNS lookup of alias-eximtesthost.test.ex (A) using fakens
 DNS lookup of alias-eximtesthost.test.ex (A) succeeded
 CNAME found: change to eximtesthost.test.ex
@@ -118,4 +113,4 @@ routed by dns router
   transport: smtp
   host eximtesthost.test.ex [ip4.ip4.ip4.ip4]
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>