Merge branch 'master' into 4.next

[users/jgh/exim.git] / test / stderr / 0085

diff --git a/test/stderr/0085 b/test/stderr/0085
index e39e5684fd113af7bb116be3a61a06e37b5ea9b9..32705b79fe344feade9d31e89b227722642d5150 100644 (file)
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -5,6 +5,9 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: smart1 propagating DSN
+DSN: fail_remote_domains propagating DSN
+DSN: smart2 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -69,11 +72,11 @@ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
 cached data used for lookup of smart.domain
   in TESTSUITE/aux-fixed/0085.data
 lookup yielded: x : y : abc@d.e.f
-address match: subject=abc@d.e.f pattern=x
+address match test: subject=abc@d.e.f pattern=x
 d.e.f in "x"? no (end of list)
-address match: subject=abc@d.e.f pattern=y
+address match test: subject=abc@d.e.f pattern=y
 d.e.f in "y"? no (end of list)
-address match: subject=abc@d.e.f pattern=abc@d.e.f
+address match test: subject=abc@d.e.f pattern=abc@d.e.f
 d.e.f in "d.e.f"? yes (matched "d.e.f")
 abc@d.e.f in "x : y : abc@d.e.f"? yes (matched "abc@d.e.f")
 calling smart1 router
@@ -138,11 +141,11 @@ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
 cached data used for lookup of test.ex
   in TESTSUITE/aux-fixed/0085.data
 lookup yielded: x : y : abc@d.e.f
-address match: subject=abc@d.e.f pattern=x
+address match test: subject=abc@d.e.f pattern=x
 d.e.f in "x"? no (end of list)
-address match: subject=abc@d.e.f pattern=y
+address match test: subject=abc@d.e.f pattern=y
 d.e.f in "y"? no (end of list)
-address match: subject=abc@d.e.f pattern=abc@d.e.f
+address match test: subject=abc@d.e.f pattern=abc@d.e.f
 d.e.f in "d.e.f"? yes (matched "d.e.f")
 abc@d.e.f in "x : y : abc@d.e.f"? yes (matched "abc@d.e.f")
 checking require_files
@@ -196,7 +199,7 @@ myhost.test.ex in "test.ex"? no (end of list)
 smart2 router skipped: domains mismatch
 no more routers
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
@@ -204,6 +207,9 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: smart1 propagating DSN
+DSN: fail_remote_domains propagating DSN
+DSN: smart2 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -268,11 +274,11 @@ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
 cached data used for lookup of smart.domain
   in TESTSUITE/aux-fixed/0085.data
 lookup yielded: x : y : abc@d.e.f
-address match: subject=CALLER@myhost.test.ex pattern=x
+address match test: subject=CALLER@myhost.test.ex pattern=x
 myhost.test.ex in "x"? no (end of list)
-address match: subject=CALLER@myhost.test.ex pattern=y
+address match test: subject=CALLER@myhost.test.ex pattern=y
 myhost.test.ex in "y"? no (end of list)
-address match: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
+address match test: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
 CALLER@myhost.test.ex in "x : y : abc@d.e.f"? no (end of list)
 smart1 router skipped: senders mismatch
 --------> fail_remote_domains router <--------
@@ -335,11 +341,11 @@ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
 cached data used for lookup of test.ex
   in TESTSUITE/aux-fixed/0085.data
 lookup yielded: x : y : abc@d.e.f
-address match: subject=CALLER@myhost.test.ex pattern=x
+address match test: subject=CALLER@myhost.test.ex pattern=x
 myhost.test.ex in "x"? no (end of list)
-address match: subject=CALLER@myhost.test.ex pattern=y
+address match test: subject=CALLER@myhost.test.ex pattern=y
 myhost.test.ex in "y"? no (end of list)
-address match: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
+address match test: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
 CALLER@myhost.test.ex in "x : y : abc@d.e.f"? no (end of list)
 smart2 router skipped: senders mismatch
 no more routers
@@ -367,4 +373,4 @@ myhost.test.ex in "test.ex"? no (end of list)
 smart2 router skipped: domains mismatch
 no more routers
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>