X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4b424e0d861166cbe0faf3620f42b23247281c24..d9de268dd629b0a01c6e01a6bc816dca51f76b12:/test/stderr/3212?ds=inline

diff --git a/test/stderr/3212 b/test/stderr/3212
index 78d8baf67..a0cc58945 100644
--- a/test/stderr/3212
+++ b/test/stderr/3212
@@ -1,137 +1,141 @@
 Exim version x.yz ....
 changed uid/gid: -C, -D, -be or -bf forces real uid
-  uid=CALLER_UID gid=CALLER_GID pid=pppp
+  uid=CALLER_UID gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="list"
-file lookup required for list
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx, usery
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="list"
-cached data used for lookup of list
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx, usery
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="root" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="root"
-file lookup required for root
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="root" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="root"
-cached data used for lookup of root
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="list"
-cached data used for lookup of list
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx, usery
-search_open: testdb "NULL"
-search_find: file="NULL"
-  key="something" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="NULL"
-  type=testdb key="something"
-database lookup required for something
-lookup yielded: something
-search_open: testdb "NULL"
-  cached open
-search_find: file="NULL"
-  key="something" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="NULL"
-  type=testdb key="something"
-cached data used for lookup of something
-lookup yielded: something
-search_open: testdb "NULL"
-  cached open
-search_find: file="NULL"
-  key="nocache" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="NULL"
-  type=testdb key="nocache"
-database lookup required for nocache
-lookup forced cache cleanup
-lookup yielded: nocache
-search_open: testdb "NULL"
-  cached open
-search_find: file="NULL"
-  key="something" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="NULL"
-  type=testdb key="something"
-database lookup required for something
-lookup yielded: something
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="list"
-cached data used for lookup of list
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx, usery
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="root" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="root"
-cached data used for lookup of root
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="list" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="list" opts=NULL
+ file lookup required for list
+   in TESTSUITE/aux-fixed/3212.aliases
+ creating new cache entry
+ lookup yielded: userx, usery
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="list" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="list" opts=NULL
+ cached data used for lookup of list
+   in TESTSUITE/aux-fixed/3212.aliases
+ lookup yielded: userx, usery
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="root" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="root" opts=NULL
+ file lookup required for root
+   in TESTSUITE/aux-fixed/3212.aliases
+ creating new cache entry
+ lookup yielded: userx
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="root" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="root" opts=NULL
+ cached data used for lookup of root
+   in TESTSUITE/aux-fixed/3212.aliases
+ lookup yielded: userx
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="list" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="list" opts=NULL
+ cached data used for lookup of list
+   in TESTSUITE/aux-fixed/3212.aliases
+ lookup yielded: userx, usery
+ search_open: testdb "NULL"
+ search_find: file="NULL"
+   key="something" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="NULL"
+   type=testdb key="something" opts=NULL
+ database lookup required for something
+ creating new cache entry
+ lookup yielded: something
+ search_open: testdb "NULL"
+   cached open
+ search_find: file="NULL"
+   key="something" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="NULL"
+   type=testdb key="something" opts=NULL
+ cached data used for lookup of something
+ lookup yielded: something
+ search_open: testdb "NULL"
+   cached open
+ search_find: file="NULL"
+   key="nocache" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="NULL"
+   type=testdb key="nocache" opts=NULL
+ database lookup required for nocache
+ lookup forced cache cleanup
+ lookup yielded: nocache
+ search_open: testdb "NULL"
+   cached open
+ search_find: file="NULL"
+   key="something" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="NULL"
+   type=testdb key="something" opts=NULL
+ database lookup required for something
+ creating new cache entry
+ lookup yielded: something
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="list" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="list" opts=NULL
+ cached data used for lookup of list
+   in TESTSUITE/aux-fixed/3212.aliases
+ lookup yielded: userx, usery
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="root" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="root" opts=NULL
+ cached data used for lookup of root
+   in TESTSUITE/aux-fixed/3212.aliases
+ lookup yielded: userx
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>