Callouts: simplfy logging

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

diff --git a/test/stderr/0387 b/test/stderr/0387
index fcd9bccd522793d533c86f1965ccea749252ec2b..7c06934ffa0997abd3814f43c3636cbf6eb73938 100644 (file)
--- a/test/stderr/0387
+++ b/test/stderr/0387
@@ -2,11 +2,12 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+dropping to exim gid; retaining priv uid
 search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="a.b.c" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="a.b.c"
@@ -30,7 +31,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="x.y.c" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="x.y.c"
@@ -54,7 +55,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="x.y.c" partial=2 affix=*. starflags=1
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="x.y.c"
@@ -84,7 +85,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="x.y.c" partial=1 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="x.y.c"
@@ -114,7 +115,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="x@y.c" partial=1 affix=*. starflags=2
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="x@y.c"
@@ -138,7 +139,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="x@y.c" partial=-1 affix=NULL starflags=2
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="x@y.c"
@@ -156,7 +157,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="a.b.c" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="a.b.c"
@@ -180,7 +181,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="a.b.c" partial=2 affix=. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="a.b.c"
@@ -204,7 +205,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="a.b.c" partial=2 affix= starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="a.b.c"
@@ -222,7 +223,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="a.b.c" partial=2 affix=* starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="a.b.c"
@@ -246,7 +247,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="p.q.r" partial=0 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="p.q.r"
@@ -282,7 +283,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="p.q.r" partial=0 affix=. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="p.q.r"
@@ -318,7 +319,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="x.aa.bb" partial=0 affix=++ starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="x.aa.bb"
@@ -342,7 +343,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="x.aa.zz" partial=0 affix=++ starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="x.aa.zz"
@@ -378,7 +379,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="x.aa.zz" partial=1 affix=++ starflags=1
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="x.aa.zz"
@@ -414,7 +415,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
 search_find: file="TESTSUITE/aux-fixed/0387.1"
   key="a.b.c" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0387.1
+  0TESTSUITE/aux-fixed/0387.1
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
   type=lsearch key="a.b.c"
@@ -434,4 +435,4 @@ cached data used for lookup of *.b.c
   in TESTSUITE/aux-fixed/0387.1
 lookup yielded: [*.b.c]
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>