Testsuite: output changes resulting

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

diff --git a/test/stderr/2201 b/test/stderr/2201
index 26c59e86cf0ff7c50c3c52604a87dfb951cd8d39..d25ac45754c0d85962cafb81d573d948b0dd454a 100644 (file)
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -29,24 +29,25 @@ local_part=test.ex domain=test.ex
 checking domains
 search_open: dnsdb "NULL"
 search_find: file="NULL"
 checking domains
 search_open: dnsdb "NULL"
 search_find: file="NULL"

-  key="test.ex" partial=-1 affix=NULL starflags=0
+  key="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="test.ex"
+  type=dnsdb key="test.ex" opts=NULL

 database lookup required for test.ex
 dnsdb key: test.ex
 DNS lookup of test.ex (TXT) using fakens
 DNS lookup of test.ex (TXT) succeeded
 database lookup required for test.ex
 dnsdb key: test.ex
 DNS lookup of test.ex (TXT) using fakens
 DNS lookup of test.ex (TXT) succeeded

+creating new cache entry

 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
 checking local_parts
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
 checking local_parts
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"

-  key="test.ex" partial=-1 affix=NULL starflags=0
+  key="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="test.ex"
+  type=dnsdb key="test.ex" opts=NULL

 cached data used for lookup of test.ex
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
 cached data used for lookup of test.ex
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")


@@ -79,10 +80,10 @@ checking domains
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"

-  key="test.ex" partial=-1 affix=NULL starflags=0
+  key="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="test.ex"
+  type=dnsdb key="test.ex" opts=NULL

 cached data used for lookup of test.ex
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
 cached data used for lookup of test.ex
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")


@@ -90,10 +91,10 @@ checking local_parts
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"

-  key="unknown" partial=-1 affix=NULL starflags=0
+  key="unknown" 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="unknown"
+  type=dnsdb key="unknown" opts=NULL

 database lookup required for unknown
 dnsdb key: unknown
 DNS lookup of unknown (TXT) using fakens
 database lookup required for unknown
 dnsdb key: unknown
 DNS lookup of unknown (TXT) using fakens


@@ -101,6 +102,7 @@ DNS lookup of unknown (TXT) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
 faking res_search(TXT) response length as 65535
  writing neg-cache entry for unknown-TXT-xxxx, ttl 3000
 returning DNS_NOMATCH
 faking res_search(TXT) response length as 65535
  writing neg-cache entry for unknown-TXT-xxxx, ttl 3000

+creating new cache entry

 lookup failed
 unknown in "dnsdb;unknown"? no (end of list)
 r1 router skipped: local_parts mismatch
 lookup failed
 unknown in "dnsdb;unknown"? no (end of list)
 r1 router skipped: local_parts mismatch


@@ -110,10 +112,10 @@ checking domains
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"

-  key="test.ex" partial=-1 affix=NULL starflags=0
+  key="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="test.ex"
+  type=dnsdb key="test.ex" opts=NULL

 cached data used for lookup of test.ex
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
 cached data used for lookup of test.ex
 lookup yielded: A TXT record for test.ex.
 test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")


@@ -122,14 +124,15 @@ address match test: subject=CALLER@myhost.test.ex pattern=dnsdb;A=myhost.test.ex
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"

-  key="A=myhost.test.ex" partial=-1 affix=NULL starflags=0
+  key="A=myhost.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=myhost.test.ex"
+  type=dnsdb key="A=myhost.test.ex" opts=NULL

 database lookup required for A=myhost.test.ex
 dnsdb key: myhost.test.ex
 DNS lookup of myhost.test.ex (A) using fakens
 DNS lookup of myhost.test.ex (A) succeeded
 database lookup required for A=myhost.test.ex
 dnsdb key: myhost.test.ex
 DNS lookup of myhost.test.ex (A) using fakens
 DNS lookup of myhost.test.ex (A) succeeded

+creating new cache entry

 lookup yielded: V4NET.10.10.10
 CALLER@myhost.test.ex in "dnsdb;A=myhost.test.ex"? yes (matched "dnsdb;A=myhost.test.ex")
 calling r2 router
 lookup yielded: V4NET.10.10.10
 CALLER@myhost.test.ex in "dnsdb;A=myhost.test.ex"? yes (matched "dnsdb;A=myhost.test.ex")
 calling r2 router


@@ -153,31 +156,33 @@ 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

+creating new cache entry

 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"
+  type=dnsdb key="a=shorthost.test.ex" opts=NULL

 cached data used for lookup of a=shorthost.test.ex
 lookup yielded: 127.0.0.1
 search_open: dnsdb "NULL"
   cached open
 search_find: file="NULL"
 cached data used for lookup of a=shorthost.test.ex
 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

+replacing old cache entry

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