X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/42c7f0b4ea09d8971a19beeef743ec8981d4aacc..436c0d208b49421d3d126f7c284bc3130b50ff14:/test/stderr/0387?ds=inline

diff --git a/test/stderr/0387 b/test/stderr/0387
index 702e02538..292f52337 100644
--- a/test/stderr/0387
+++ b/test/stderr/0387
@@ -5,434 +5,434 @@ 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
+   key="a.b.c" partial=2 affix=*. starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="a.b.c"
+   type=lsearch key="a.b.c" opts=NULL
  file lookup required for a.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.a.b.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.a.b.c"
+   type=lsearch key="*.a.b.c" opts=NULL
  file lookup required for *.a.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.b.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.b.c"
+   type=lsearch key="*.b.c" opts=NULL
  file lookup required for *.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [*.b.c]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="x.y.c" partial=2 affix=*. starflags=0
+   key="x.y.c" partial=2 affix=*. starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="x.y.c"
+   type=lsearch key="x.y.c" opts=NULL
  file lookup required for x.y.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.x.y.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.x.y.c"
+   type=lsearch key="*.x.y.c" opts=NULL
  file lookup required for *.x.y.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.y.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.y.c"
+   type=lsearch key="*.y.c" opts=NULL
  file lookup required for *.y.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="x.y.c" partial=2 affix=*. starflags=1
+   key="x.y.c" partial=2 affix=*. starflags=1 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="x.y.c"
+   type=lsearch key="x.y.c" opts=NULL
  cached data used for lookup of x.y.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.x.y.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.x.y.c"
+   type=lsearch key="*.x.y.c" opts=NULL
  cached data used for lookup of *.x.y.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.y.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.y.c"
+   type=lsearch key="*.y.c" opts=NULL
  cached data used for lookup of *.y.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying to match *
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*"
+   type=lsearch key="*" opts=NULL
  file lookup required for *
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [*]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="x.y.c" partial=1 affix=*. starflags=0
+   key="x.y.c" partial=1 affix=*. starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="x.y.c"
+   type=lsearch key="x.y.c" opts=NULL
  cached data used for lookup of x.y.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.x.y.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.x.y.c"
+   type=lsearch key="*.x.y.c" opts=NULL
  cached data used for lookup of *.x.y.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.y.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.y.c"
+   type=lsearch key="*.y.c" opts=NULL
  cached data used for lookup of *.y.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.c"
+   type=lsearch key="*.c" opts=NULL
  file lookup required for *.c
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [*.c]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="x@y.c" partial=1 affix=*. starflags=2
+   key="x@y.c" partial=1 affix=*. starflags=2 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="x@y.c"
+   type=lsearch key="x@y.c" opts=NULL
  file lookup required for x@y.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.x@y.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.x@y.c"
+   type=lsearch key="*.x@y.c" opts=NULL
  file lookup required for *.x@y.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.c"
+   type=lsearch key="*.c" opts=NULL
  cached data used for lookup of *.c
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [*.c]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="x@y.c" partial=-1 affix=NULL starflags=2
+   key="x@y.c" partial=-1 affix=NULL starflags=2 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="x@y.c"
+   type=lsearch key="x@y.c" opts=NULL
  cached data used for lookup of x@y.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying default match *@y.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*@y.c"
+   type=lsearch key="*@y.c" opts=NULL
  file lookup required for *@y.c
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [*@y.c]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="a.b.c" partial=2 affix=*. starflags=0
+   key="a.b.c" partial=2 affix=*. starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="a.b.c"
+   type=lsearch key="a.b.c" opts=NULL
  cached data used for lookup of a.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.a.b.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.a.b.c"
+   type=lsearch key="*.a.b.c" opts=NULL
  cached data used for lookup of *.a.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.b.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.b.c"
+   type=lsearch key="*.b.c" opts=NULL
  cached data used for lookup of *.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [*.b.c]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="a.b.c" partial=2 affix=. starflags=0
+   key="a.b.c" partial=2 affix=. starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="a.b.c"
+   type=lsearch key="a.b.c" opts=NULL
  cached data used for lookup of a.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match .a.b.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key=".a.b.c"
+   type=lsearch key=".a.b.c" opts=NULL
  file lookup required for .a.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match .b.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key=".b.c"
+   type=lsearch key=".b.c" opts=NULL
  file lookup required for .b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [.b.c]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="a.b.c" partial=2 affix= starflags=0
+   key="a.b.c" partial=2 affix= starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="a.b.c"
+   type=lsearch key="a.b.c" opts=NULL
  cached data used for lookup of a.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match b.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="b.c"
+   type=lsearch key="b.c" opts=NULL
  file lookup required for b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [b.c]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="a.b.c" partial=2 affix=* starflags=0
+   key="a.b.c" partial=2 affix=* starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="a.b.c"
+   type=lsearch key="a.b.c" opts=NULL
  cached data used for lookup of a.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *a.b.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*a.b.c"
+   type=lsearch key="*a.b.c" opts=NULL
  file lookup required for *a.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *b.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*b.c"
+   type=lsearch key="*b.c" opts=NULL
  file lookup required for *b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [*b.c]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="p.q.r" partial=0 affix=*. starflags=0
+   key="p.q.r" partial=0 affix=*. starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="p.q.r"
+   type=lsearch key="p.q.r" opts=NULL
  file lookup required for p.q.r
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.p.q.r
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.p.q.r"
+   type=lsearch key="*.p.q.r" opts=NULL
  file lookup required for *.p.q.r
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.q.r
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.q.r"
+   type=lsearch key="*.q.r" opts=NULL
  file lookup required for *.q.r
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.r
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.r"
+   type=lsearch key="*.r" opts=NULL
  file lookup required for *.r
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*"
+   type=lsearch key="*" opts=NULL
  cached data used for lookup of *
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [*]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="p.q.r" partial=0 affix=. starflags=0
+   key="p.q.r" partial=0 affix=. starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="p.q.r"
+   type=lsearch key="p.q.r" opts=NULL
  cached data used for lookup of p.q.r
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match .p.q.r
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key=".p.q.r"
+   type=lsearch key=".p.q.r" opts=NULL
  file lookup required for .p.q.r
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match .q.r
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key=".q.r"
+   type=lsearch key=".q.r" opts=NULL
  file lookup required for .q.r
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match .r
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key=".r"
+   type=lsearch key=".r" opts=NULL
  file lookup required for .r
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match .
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="."
+   type=lsearch key="." opts=NULL
  file lookup required for .
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [.]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="x.aa.bb" partial=0 affix=++ starflags=0
+   key="x.aa.bb" partial=0 affix=++ starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="x.aa.bb"
+   type=lsearch key="x.aa.bb" opts=NULL
  file lookup required for x.aa.bb
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match ++x.aa.bb
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="++x.aa.bb"
+   type=lsearch key="++x.aa.bb" opts=NULL
  file lookup required for ++x.aa.bb
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match ++aa.bb
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="++aa.bb"
+   type=lsearch key="++aa.bb" opts=NULL
  file lookup required for ++aa.bb
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [++aa.bb]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="x.aa.zz" partial=0 affix=++ starflags=0
+   key="x.aa.zz" partial=0 affix=++ starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="x.aa.zz"
+   type=lsearch key="x.aa.zz" opts=NULL
  file lookup required for x.aa.zz
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match ++x.aa.zz
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="++x.aa.zz"
+   type=lsearch key="++x.aa.zz" opts=NULL
  file lookup required for ++x.aa.zz
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match ++aa.zz
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="++aa.zz"
+   type=lsearch key="++aa.zz" opts=NULL
  file lookup required for ++aa.zz
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match ++zz
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="++zz"
+   type=lsearch key="++zz" opts=NULL
  file lookup required for ++zz
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match ++
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="++"
+   type=lsearch key="++" opts=NULL
  file lookup required for ++
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [++]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="x.aa.zz" partial=1 affix=++ starflags=1
+   key="x.aa.zz" partial=1 affix=++ starflags=1 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="x.aa.zz"
+   type=lsearch key="x.aa.zz" opts=NULL
  cached data used for lookup of x.aa.zz
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match ++x.aa.zz
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="++x.aa.zz"
+   type=lsearch key="++x.aa.zz" opts=NULL
  cached data used for lookup of ++x.aa.zz
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match ++aa.zz
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="++aa.zz"
+   type=lsearch key="++aa.zz" opts=NULL
  cached data used for lookup of ++aa.zz
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match ++zz
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="++zz"
+   type=lsearch key="++zz" opts=NULL
  cached data used for lookup of ++zz
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying to match *
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*"
+   type=lsearch key="*" opts=NULL
  cached data used for lookup of *
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [*]
  search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0387.1"
-   key="a.b.c" partial=2 affix=*. starflags=0
+   key="a.b.c" partial=2 affix=*. starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0387.1
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="a.b.c"
+   type=lsearch key="a.b.c" opts=NULL
  cached data used for lookup of a.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.a.b.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.a.b.c"
+   type=lsearch key="*.a.b.c" opts=NULL
  cached data used for lookup of *.a.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup failed
  trying partial match *.b.c
  internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-   type=lsearch key="*.b.c"
+   type=lsearch key="*.b.c" opts=NULL
  cached data used for lookup of *.b.c
    in TESTSUITE/aux-fixed/0387.1
  lookup yielded: [*.b.c]
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>