Taint: fix ACL "spam" condition, to permit tainted name arguments.

[users/heiko/exim.git] / test / stderr / 2200

diff --git a/test/stderr/2200 b/test/stderr/2200
index 667c71b29725ea135996d4ed25429adb4636a7e9..ba50dffa7900af1293815530d2475bdab5adb62b 100644 (file)
--- a/test/stderr/2200
+++ b/test/stderr/2200
@@ -4,23 +4,20 @@ admin user
 dropping to exim gid; retaining priv uid
  search_open: dnsdb "NULL"
  search_find: file="NULL"
 dropping to exim gid; retaining priv uid
  search_open: dnsdb "NULL"
  search_find: file="NULL"

-   key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0
+   key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=dnsdb key="a=localhost.test.ex"
+   type=dnsdb key="a=localhost.test.ex" opts=NULL

  database lookup required for a=localhost.test.ex
  dnsdb key: localhost.test.ex
  database lookup required for a=localhost.test.ex
  dnsdb key: localhost.test.ex

-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp

  lookup yielded: 127.0.0.1
  search_open: dnsdb "NULL"
    cached open
  search_find: file="NULL"
  lookup yielded: 127.0.0.1
  search_open: dnsdb "NULL"
    cached open
  search_find: file="NULL"

-   key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0
+   key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=dnsdb key="a=localhost.test.ex"
+   type=dnsdb key="a=localhost.test.ex" opts=NULL

  cached data used for lookup of a=localhost.test.ex
  lookup yielded: 127.0.0.1
 search_tidyup called
  cached data used for lookup of a=localhost.test.ex
  lookup yielded: 127.0.0.1
 search_tidyup called


@@ -32,28 +29,22 @@ search_tidyup called
 search_tidyup called
   search_open: dnsdb "NULL"
   search_find: file="NULL"
 search_tidyup called
   search_open: dnsdb "NULL"
   search_find: file="NULL"

-    key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0
+    key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0 opts=NULL

   LRU list:
   internal_search_find: file="NULL"
   LRU list:
   internal_search_find: file="NULL"

-    type=dnsdb key="a=shorthost.test.ex"
+    type=dnsdb key="a=shorthost.test.ex" opts=NULL

   database lookup required for a=shorthost.test.ex
   dnsdb key: shorthost.test.ex
   database lookup required for a=shorthost.test.ex
   dnsdb key: shorthost.test.ex

-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp

   lookup yielded: 127.0.0.1
   search_open: dnsdb "NULL"
     cached open
   search_find: file="NULL"
   lookup yielded: 127.0.0.1
   search_open: dnsdb "NULL"
     cached open
   search_find: file="NULL"

-    key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0
+    key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0 opts=NULL

   LRU list:
   internal_search_find: file="NULL"
   LRU list:
   internal_search_find: file="NULL"

-    type=dnsdb key="a=shorthost.test.ex"
-  cached data found but past valid time;   database lookup required for a=shorthost.test.ex
+    type=dnsdb key="a=shorthost.test.ex" opts=NULL
+  cached data found but out-of-date;   database lookup required for a=shorthost.test.ex

   dnsdb key: shorthost.test.ex
   dnsdb key: shorthost.test.ex

-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp

   lookup yielded: 127.0.0.1
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
   lookup yielded: 127.0.0.1
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss