Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0414

diff --git a/test/stderr/0414 b/test/stderr/0414
index c6bdff868688827d3652addbab5e0f19d4267a9f..6ac19025ad2f6228f93b249d1358014703772484 100644 (file)
--- a/test/stderr/0414
+++ b/test/stderr/0414
@@ -3,6 +3,9 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+DSN: r3 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
@@ -21,7 +24,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
 search_find: file="TESTSUITE/aux-fixed/0414.list1"
   key="b.domain" partial=-1 affix=NULL starflags=0
 LRU list:
-  ;TESTSUITE/aux-fixed/0414.list1
+  0TESTSUITE/aux-fixed/0414.list1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"
   type=lsearch key="b.domain"
@@ -33,8 +36,8 @@ search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
 search_find: file="TESTSUITE/aux-fixed/0414.list2"
   key="b.domain" partial=-1 affix=NULL starflags=0
 LRU list:
-  ;TESTSUITE/aux-fixed/0414.list2
-  ;TESTSUITE/aux-fixed/0414.list1
+  0TESTSUITE/aux-fixed/0414.list2
+  0TESTSUITE/aux-fixed/0414.list1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"
   type=lsearch key="b.domain"
@@ -79,8 +82,8 @@ search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
 search_find: file="TESTSUITE/aux-fixed/0414.list1"
   key="a.domain" partial=-1 affix=NULL starflags=0
 LRU list:
-  ;TESTSUITE/aux-fixed/0414.list1
-  ;TESTSUITE/aux-fixed/0414.list2
+  0TESTSUITE/aux-fixed/0414.list1
+  0TESTSUITE/aux-fixed/0414.list2
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"
   type=lsearch key="a.domain"
@@ -101,8 +104,8 @@ search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
 search_find: file="TESTSUITE/aux-fixed/0414.list2"
   key="a.domain" partial=-1 affix=NULL starflags=0
 LRU list:
-  ;TESTSUITE/aux-fixed/0414.list2
-  ;TESTSUITE/aux-fixed/0414.list1
+  0TESTSUITE/aux-fixed/0414.list2
+  0TESTSUITE/aux-fixed/0414.list1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"
   type=lsearch key="a.domain"
@@ -131,4 +134,4 @@ routed by r3 router
   envelope to: x@a.domain
   transport: t1
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>