Tweak debug output

[exim.git] / test / stderr / 0123

diff --git a/test/stderr/0123 b/test/stderr/0123
index e6cdeea543b8356632afdc22bd8e52229e3a8a44..d9f4557f54cc0b7bedf49fe78302f2f45f2224ed 100644 (file)
--- a/test/stderr/0123
+++ b/test/stderr/0123
@@ -1,6 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -19,14 +19,15 @@ calling l1 router
 rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases1}}'
  search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases1"
  search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
-   key="x" partial=-1 affix=NULL starflags=0
+   key="x" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
-   type=lsearch key="x"
+   type=lsearch key="x" opts=NULL
  file lookup required for x
    in TESTSUITE/aux-fixed/0123.aliases1
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -38,15 +39,16 @@ calling l2 router
 rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases2}}'
  search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases2"
  search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
-   key="x" partial=-1 affix=NULL starflags=0
+   key="x" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases2
    0TESTSUITE/aux-fixed/0123.aliases1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
-   type=lsearch key="x"
+   type=lsearch key="x" opts=NULL
  file lookup required for x
    in TESTSUITE/aux-fixed/0123.aliases2
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -60,15 +62,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases1
  search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
-   key="x" partial=-1 affix=NULL starflags=0
+   key="x" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases3
    0TESTSUITE/aux-fixed/0123.aliases2
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
-   type=lsearch key="x"
+   type=lsearch key="x" opts=NULL
  file lookup required for x
    in TESTSUITE/aux-fixed/0123.aliases3
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -82,15 +85,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases2
  search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
-   key="x" partial=-1 affix=NULL starflags=0
+   key="x" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases4
    0TESTSUITE/aux-fixed/0123.aliases3
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
-   type=lsearch key="x"
+   type=lsearch key="x" opts=NULL
  file lookup required for x
    in TESTSUITE/aux-fixed/0123.aliases4
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -104,15 +108,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases3
  search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
-   key="x" partial=-1 affix=NULL starflags=0
+   key="x" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases5
    0TESTSUITE/aux-fixed/0123.aliases4
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
-   type=lsearch key="x"
+   type=lsearch key="x" opts=NULL
  file lookup required for x
    in TESTSUITE/aux-fixed/0123.aliases5
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -126,15 +131,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases4
  search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
-   key="x" partial=-1 affix=NULL starflags=0
+   key="x" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases6
    0TESTSUITE/aux-fixed/0123.aliases5
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
-   type=lsearch key="x"
+   type=lsearch key="x" opts=NULL
  file lookup required for x
    in TESTSUITE/aux-fixed/0123.aliases6
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -156,15 +162,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases5
  search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
-   key="y" partial=-1 affix=NULL starflags=0
+   key="y" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases1
    0TESTSUITE/aux-fixed/0123.aliases6
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
-   type=lsearch key="y"
+   type=lsearch key="y" opts=NULL
  file lookup required for y
    in TESTSUITE/aux-fixed/0123.aliases1
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -179,15 +186,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases6
  search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
-   key="y" partial=-1 affix=NULL starflags=0
+   key="y" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases2
    0TESTSUITE/aux-fixed/0123.aliases1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
-   type=lsearch key="y"
+   type=lsearch key="y" opts=NULL
  file lookup required for y
    in TESTSUITE/aux-fixed/0123.aliases2
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -202,15 +210,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases1
  search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
-   key="y" partial=-1 affix=NULL starflags=0
+   key="y" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases3
    0TESTSUITE/aux-fixed/0123.aliases2
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
-   type=lsearch key="y"
+   type=lsearch key="y" opts=NULL
  file lookup required for y
    in TESTSUITE/aux-fixed/0123.aliases3
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -225,15 +234,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases2
  search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
-   key="y" partial=-1 affix=NULL starflags=0
+   key="y" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases4
    0TESTSUITE/aux-fixed/0123.aliases3
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
-   type=lsearch key="y"
+   type=lsearch key="y" opts=NULL
  file lookup required for y
    in TESTSUITE/aux-fixed/0123.aliases4
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -248,15 +258,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases3
  search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
-   key="y" partial=-1 affix=NULL starflags=0
+   key="y" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases5
    0TESTSUITE/aux-fixed/0123.aliases4
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
-   type=lsearch key="y"
+   type=lsearch key="y" opts=NULL
  file lookup required for y
    in TESTSUITE/aux-fixed/0123.aliases5
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -271,15 +282,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases4
  search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
-   key="y" partial=-1 affix=NULL starflags=0
+   key="y" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases6
    0TESTSUITE/aux-fixed/0123.aliases5
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
-   type=lsearch key="y"
+   type=lsearch key="y" opts=NULL
  file lookup required for y
    in TESTSUITE/aux-fixed/0123.aliases6
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -301,15 +313,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases5
  search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
-   key="z" partial=-1 affix=NULL starflags=0
+   key="z" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases1
    0TESTSUITE/aux-fixed/0123.aliases6
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
-   type=lsearch key="z"
+   type=lsearch key="z" opts=NULL
  file lookup required for z
    in TESTSUITE/aux-fixed/0123.aliases1
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -324,15 +337,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases6
  search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
-   key="z" partial=-1 affix=NULL starflags=0
+   key="z" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases2
    0TESTSUITE/aux-fixed/0123.aliases1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
-   type=lsearch key="z"
+   type=lsearch key="z" opts=NULL
  file lookup required for z
    in TESTSUITE/aux-fixed/0123.aliases2
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -347,15 +361,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases1
  search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
-   key="z" partial=-1 affix=NULL starflags=0
+   key="z" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases3
    0TESTSUITE/aux-fixed/0123.aliases2
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
-   type=lsearch key="z"
+   type=lsearch key="z" opts=NULL
  file lookup required for z
    in TESTSUITE/aux-fixed/0123.aliases3
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -370,15 +385,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases2
  search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
-   key="z" partial=-1 affix=NULL starflags=0
+   key="z" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases4
    0TESTSUITE/aux-fixed/0123.aliases3
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
-   type=lsearch key="z"
+   type=lsearch key="z" opts=NULL
  file lookup required for z
    in TESTSUITE/aux-fixed/0123.aliases4
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -393,15 +409,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases3
  search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
-   key="z" partial=-1 affix=NULL starflags=0
+   key="z" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases5
    0TESTSUITE/aux-fixed/0123.aliases4
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
-   type=lsearch key="z"
+   type=lsearch key="z" opts=NULL
  file lookup required for z
    in TESTSUITE/aux-fixed/0123.aliases5
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -416,15 +433,16 @@ rda_interpret (string): '${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.a
  Too many lookup files open
    closing 0TESTSUITE/aux-fixed/0123.aliases4
  search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
-   key="z" partial=-1 affix=NULL starflags=0
+   key="z" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0123.aliases6
    0TESTSUITE/aux-fixed/0123.aliases5
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
-   type=lsearch key="z"
+   type=lsearch key="z" opts=NULL
  file lookup required for z
    in TESTSUITE/aux-fixed/0123.aliases6
+ creating new cache entry
  lookup failed
 expanded: ''
 file is not a filter file
@@ -432,4 +450,4 @@ parse_forward_list:
 c3 router declined for z@test.ex
 no more routers
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>