MySQL, pgsql: per-query server options outside the lookup string. Bug 2546

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

diff --git a/test/stderr/0085 b/test/stderr/0085
index 56c65f6b454f91b2c71e7f58512db5ce2ab67616..702e7f5631208002363f6c58758918281b77a793 100644 (file)
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -28,7 +28,7 @@ y.z in "test.ex : myhost.test.ex"? no (end of list)
 y.z in "! +local_domains"? yes (end of list)
 calling fail_remote_domains router
 rda_interpret (string): ':fail: unrouteable mail domain "$domain"'
-expanded: ':fail: unrouteable mail domain "y.z"'
+expanded: ':fail: unrouteable mail domain "y.z"' (tainted)
 file is not a filter file
 parse_forward_list: :fail: unrouteable mail domain "y.z"
 extract item: :fail: unrouteable mail domain "y.z"
@@ -46,12 +46,12 @@ smart.domain in "smart.domain"? yes (matched "smart.domain")
 checking local_parts
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
  search_find: file="TESTSUITE/aux-fixed/0085.data"
-   key="smart.domain" partial=-1 affix=NULL starflags=0
+   key="smart.domain" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0085.data
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-   type=lsearch key="smart.domain"
+   type=lsearch key="smart.domain" opts=NULL
  file lookup required for smart.domain
    in TESTSUITE/aux-fixed/0085.data
  lookup yielded: x : y : abc@d.e.f
@@ -60,12 +60,12 @@ checking senders
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0085.data"
-   key="smart.domain" partial=-1 affix=NULL starflags=0
+   key="smart.domain" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0085.data
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-   type=lsearch key="smart.domain"
+   type=lsearch key="smart.domain" opts=NULL
  cached data used for lookup of smart.domain
    in TESTSUITE/aux-fixed/0085.data
  lookup yielded: x : y : abc@d.e.f
@@ -115,12 +115,12 @@ checking local_parts
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0085.data"
-   key="test.ex" partial=-1 affix=NULL starflags=0
+   key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0085.data
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-   type=lsearch key="test.ex"
+   type=lsearch key="test.ex" opts=NULL
  file lookup required for test.ex
    in TESTSUITE/aux-fixed/0085.data
  lookup yielded: x : y : abc@d.e.f
@@ -129,12 +129,12 @@ checking senders
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0085.data"
-   key="test.ex" partial=-1 affix=NULL starflags=0
+   key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0085.data
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-   type=lsearch key="test.ex"
+   type=lsearch key="test.ex" opts=NULL
  cached data used for lookup of test.ex
    in TESTSUITE/aux-fixed/0085.data
  lookup yielded: x : y : abc@d.e.f
@@ -149,12 +149,12 @@ checking require_files
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0085.data"
-   key="test.ex.files" partial=-1 affix=NULL starflags=0
+   key="test.ex.files" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0085.data
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-   type=lsearch key="test.ex.files"
+   type=lsearch key="test.ex.files" opts=NULL
  file lookup required for test.ex.files
    in TESTSUITE/aux-fixed/0085.data
  lookup yielded: /etc/passwd
@@ -196,7 +196,7 @@ myhost.test.ex in "test.ex"? no (end of list)
 smart2 router skipped: domains mismatch
 no more routers
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
@@ -227,7 +227,7 @@ y.z in "test.ex : myhost.test.ex"? no (end of list)
 y.z in "! +local_domains"? yes (end of list)
 calling fail_remote_domains router
 rda_interpret (string): ':fail: unrouteable mail domain "$domain"'
-expanded: ':fail: unrouteable mail domain "y.z"'
+expanded: ':fail: unrouteable mail domain "y.z"' (tainted)
 file is not a filter file
 parse_forward_list: :fail: unrouteable mail domain "y.z"
 extract item: :fail: unrouteable mail domain "y.z"
@@ -245,12 +245,12 @@ smart.domain in "smart.domain"? yes (matched "smart.domain")
 checking local_parts
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
  search_find: file="TESTSUITE/aux-fixed/0085.data"
-   key="smart.domain" partial=-1 affix=NULL starflags=0
+   key="smart.domain" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0085.data
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-   type=lsearch key="smart.domain"
+   type=lsearch key="smart.domain" opts=NULL
  file lookup required for smart.domain
    in TESTSUITE/aux-fixed/0085.data
  lookup yielded: x : y : abc@d.e.f
@@ -259,12 +259,12 @@ checking senders
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0085.data"
-   key="smart.domain" partial=-1 affix=NULL starflags=0
+   key="smart.domain" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0085.data
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-   type=lsearch key="smart.domain"
+   type=lsearch key="smart.domain" opts=NULL
  cached data used for lookup of smart.domain
    in TESTSUITE/aux-fixed/0085.data
  lookup yielded: x : y : abc@d.e.f
@@ -282,7 +282,7 @@ smart.domain in "test.ex : myhost.test.ex"? no (end of list)
 smart.domain in "! +local_domains"? yes (end of list)
 calling fail_remote_domains router
 rda_interpret (string): ':fail: unrouteable mail domain "$domain"'
-expanded: ':fail: unrouteable mail domain "smart.domain"'
+expanded: ':fail: unrouteable mail domain "smart.domain"' (tainted)
 file is not a filter file
 parse_forward_list: :fail: unrouteable mail domain "smart.domain"
 extract item: :fail: unrouteable mail domain "smart.domain"
@@ -312,12 +312,12 @@ checking local_parts
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0085.data"
-   key="test.ex" partial=-1 affix=NULL starflags=0
+   key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0085.data
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-   type=lsearch key="test.ex"
+   type=lsearch key="test.ex" opts=NULL
  file lookup required for test.ex
    in TESTSUITE/aux-fixed/0085.data
  lookup yielded: x : y : abc@d.e.f
@@ -326,12 +326,12 @@ checking senders
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
  search_find: file="TESTSUITE/aux-fixed/0085.data"
-   key="test.ex" partial=-1 affix=NULL starflags=0
+   key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
  LRU list:
    0TESTSUITE/aux-fixed/0085.data
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-   type=lsearch key="test.ex"
+   type=lsearch key="test.ex" opts=NULL
  cached data used for lookup of test.ex
    in TESTSUITE/aux-fixed/0085.data
  lookup yielded: x : y : abc@d.e.f
@@ -367,4 +367,4 @@ myhost.test.ex in "test.ex"? no (end of list)
 smart2 router skipped: domains mismatch
 no more routers
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>