Fix string_copy() macro to not multiple-eval args. Bug 2603

[exim.git] / test / stderr / 0085

diff --git a/test/stderr/0085 b/test/stderr/0085
index 94a16b960fc7261b7de10ee3435074d8932c5da8..e270896479461ba520a43fdd109fd97fe72e1268 100644 (file)
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -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
@@ -86,7 +86,7 @@ expanded list of hosts = '' options = ''
 queued for <unset> transport: local_part = x
 domain = smart.domain
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=smart.domain localpart_data=x
 routed by smart1 router
   envelope to: x@smart.domain
   transport: <none>
@@ -105,6 +105,7 @@ smart1 router skipped: domains mismatch
 local_part=x domain=test.ex
 checking domains
 test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
+data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
 test.ex in "! +local_domains"? no (matched "! +local_domains")
 fail_remote_domains router skipped: domains mismatch
 --------> smart2 router <--------
@@ -115,12 +116,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 +130,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 +150,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
@@ -168,7 +169,7 @@ set transport dummy
 queued for dummy transport: local_part = x
 domain = test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=test.ex localpart_data=x
 routed by smart2 router
   envelope to: x@test.ex
   transport: dummy
@@ -187,6 +188,7 @@ smart1 router skipped: domains mismatch
 local_part=x domain=myhost.test.ex
 checking domains
 myhost.test.ex in "test.ex : myhost.test.ex"? yes (matched "myhost.test.ex")
+data from lookup saved for cache for +local_domains: key 'myhost.test.ex' value 'myhost.test.ex'
 myhost.test.ex in "! +local_domains"? no (matched "! +local_domains")
 fail_remote_domains router skipped: domains mismatch
 --------> smart2 router <--------
@@ -245,12 +247,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 +261,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
@@ -302,6 +304,7 @@ smart1 router skipped: domains mismatch
 local_part=x domain=test.ex
 checking domains
 test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
+data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
 test.ex in "! +local_domains"? no (matched "! +local_domains")
 fail_remote_domains router skipped: domains mismatch
 --------> smart2 router <--------
@@ -312,12 +315,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 +329,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
@@ -358,6 +361,7 @@ smart1 router skipped: domains mismatch
 local_part=x domain=myhost.test.ex
 checking domains
 myhost.test.ex in "test.ex : myhost.test.ex"? yes (matched "myhost.test.ex")
+data from lookup saved for cache for +local_domains: key 'myhost.test.ex' value 'myhost.test.ex'
 myhost.test.ex in "! +local_domains"? no (matched "! +local_domains")
 fail_remote_domains router skipped: domains mismatch
 --------> smart2 router <--------