Taint: fix off-by-one in is_tainted(). Bug 2634

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

diff --git a/test/stderr/0471 b/test/stderr/0471
index 9225c11438c73dbe118c6a50def58b43f0f80253..14fbe553472036424e3e6100d9d9dc7ac6a5cca7 100644 (file)
--- a/test/stderr/0471
+++ b/test/stderr/0471
@@ -8,6 +8,8 @@ changed uid/gid: privilege not needed
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex>
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex>

+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

 Sender: CALLER@myhost.test.ex
 Recipients:
   r1@test.ex
 Sender: CALLER@myhost.test.ex
 Recipients:
   r1@test.ex


@@ -96,53 +98,57 @@ To: random@test.example,
  
 **** debug string too long - truncated ****
 
  
 **** debug string too long - truncated ****
 

-address match: subject=r1@test.ex pattern=*@*
+address match test: subject=r1@test.ex pattern=*@*

 test.ex in "*"? yes (matched "*")
 r1@test.ex in "*@*"? yes (matched "*@*")
 test.ex in "*"? yes (matched "*")
 r1@test.ex in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.ex" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.ex"
-file lookup required for test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
-trying partial match *.test.ex
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="*.test.ex"
-file lookup required for *.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
-address match: subject=CALLER@myhost.test.ex pattern=*@*
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.ex" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.ex" opts=NULL
+ file lookup required for test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ creating new cache entry
+ lookup failed
+ trying partial match *.test.ex
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="*.test.ex" opts=NULL
+ file lookup required for *.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ creating new cache entry
+ lookup failed
+address match test: subject=CALLER@myhost.test.ex pattern=*@*

 myhost.test.ex in "*"? yes (matched "*")
 CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
 myhost.test.ex in "*"? yes (matched "*")
 CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="myhost.test.ex" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="myhost.test.ex"
-file lookup required for myhost.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
-trying partial match *.myhost.test.ex
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="*.myhost.test.ex"
-file lookup required for *.myhost.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
-trying partial match *.test.ex
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="*.test.ex"
-cached data used for lookup of *.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="myhost.test.ex" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="myhost.test.ex" opts=NULL
+ file lookup required for myhost.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ creating new cache entry
+ lookup failed
+ trying partial match *.myhost.test.ex
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="*.myhost.test.ex" opts=NULL
+ file lookup required for *.myhost.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ creating new cache entry
+ lookup failed
+ trying partial match *.test.ex
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="*.test.ex" opts=NULL
+ cached data used for lookup of *.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup failed

 rewritten sender = CALLER@myhost.test.ex
 rewrite_one_header: type=T:
   To: random@test.example,
 rewritten sender = CALLER@myhost.test.ex
 rewrite_one_header: type=T:
   To: random@test.example,


@@ -225,21 +231,22 @@ rewrite_one_header: type=T:
     random@test.example,
     random@test.examp
 **** debug string too long - truncated ****
     random@test.example,
     random@test.examp
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-file lookup required for test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ file lookup required for test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ creating new cache entry
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4051 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4051 newtype=T newtext:


@@ -404,21 +411,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4053 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4053 newtype=T newtext:


@@ -583,21 +590,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4055 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4055 newtype=T newtext:


@@ -762,21 +769,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4057 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4057 newtype=T newtext:


@@ -941,21 +948,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4059 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4059 newtype=T newtext:


@@ -1120,21 +1127,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4061 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4061 newtype=T newtext:


@@ -1299,21 +1306,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4063 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4063 newtype=T newtext:


@@ -1478,21 +1485,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4065 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4065 newtype=T newtext:


@@ -1657,21 +1664,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4067 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4067 newtype=T newtext:


@@ -1836,21 +1843,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4069 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4069 newtype=T newtext:


@@ -2014,21 +2021,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4071 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4071 newtype=T newtext:


@@ -2192,21 +2199,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4073 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4073 newtype=T newtext:


@@ -2370,21 +2377,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4075 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4075 newtype=T newtext:


@@ -2548,21 +2555,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4077 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4077 newtype=T newtext:


@@ -2726,21 +2733,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4079 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4079 newtype=T newtext:


@@ -2904,21 +2911,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4081 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4081 newtype=T newtext:


@@ -3082,21 +3089,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4083 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4083 newtype=T newtext:


@@ -3260,21 +3267,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4085 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4085 newtype=T newtext:


@@ -3438,21 +3445,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4087 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4087 newtype=T newtext:


@@ -3616,21 +3623,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4089 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4089 newtype=T newtext:


@@ -3794,21 +3801,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4091 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4091 newtype=T newtext:


@@ -3972,21 +3979,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4093 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4093 newtype=T newtext:


@@ -4150,21 +4157,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4095 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4095 newtype=T newtext:


@@ -4327,21 +4334,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4097 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4097 newtype=T newtext:


@@ -4504,21 +4511,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4099 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4099 newtype=T newtext:


@@ -4681,21 +4688,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4101 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4101 newtype=T newtext:


@@ -4858,21 +4865,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4103 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4103 newtype=T newtext:


@@ -5035,21 +5042,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4105 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4105 newtype=T newtext:


@@ -5212,21 +5219,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4107 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4107 newtype=T newtext:


@@ -5389,21 +5396,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4109 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4109 newtype=T newtext:


@@ -5566,21 +5573,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4111 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4111 newtype=T newtext:


@@ -5743,21 +5750,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4113 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4113 newtype=T newtext:


@@ -5920,21 +5927,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4115 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4115 newtype=T newtext:


@@ -6097,21 +6104,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4117 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4117 newtype=T newtext:


@@ -6274,21 +6281,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4119 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4119 newtype=T newtext:


@@ -6450,21 +6457,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4121 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4121 newtype=T newtext:


@@ -6626,21 +6633,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4123 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4123 newtype=T newtext:


@@ -6802,21 +6809,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4125 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4125 newtype=T newtext:


@@ -6978,21 +6985,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4127 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4127 newtype=T newtext:


@@ -7154,21 +7161,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4129 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4129 newtype=T newtext:


@@ -7330,21 +7337,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4131 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4131 newtype=T newtext:


@@ -7506,21 +7513,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4133 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4133 newtype=T newtext:


@@ -7682,21 +7689,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4135 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4135 newtype=T newtext:


@@ -7858,21 +7865,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4137 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4137 newtype=T newtext:


@@ -8034,21 +8041,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4139 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4139 newtype=T newtext:


@@ -8210,21 +8217,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4141 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4141 newtype=T newtext:


@@ -8386,21 +8393,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4143 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4143 newtype=T newtext:


@@ -8562,21 +8569,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4145 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4145 newtype=T newtext:


@@ -8737,21 +8744,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4147 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4147 newtype=T newtext:


@@ -8912,21 +8919,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4149 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4149 newtype=T newtext:


@@ -9087,21 +9094,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4151 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4151 newtype=T newtext:


@@ -9262,21 +9269,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4153 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4153 newtype=T newtext:


@@ -9437,21 +9444,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4155 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4155 newtype=T newtext:


@@ -9612,21 +9619,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4157 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4157 newtype=T newtext:


@@ -9787,21 +9794,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4159 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4159 newtype=T newtext:


@@ -9962,21 +9969,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4161 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4161 newtype=T newtext:


@@ -10137,21 +10144,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4163 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4163 newtype=T newtext:


@@ -10312,21 +10319,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4165 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4165 newtype=T newtext:


@@ -10487,21 +10494,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4167 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4167 newtype=T newtext:


@@ -10662,21 +10669,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4169 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4169 newtype=T newtext:


@@ -10836,21 +10843,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4171 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4171 newtype=T newtext:


@@ -11010,21 +11017,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4173 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4173 newtype=T newtext:


@@ -11184,21 +11191,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4175 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4175 newtype=T newtext:


@@ -11358,21 +11365,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4177 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4177 newtype=T newtext:


@@ -11532,21 +11539,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4179 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4179 newtype=T newtext:


@@ -11706,21 +11713,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4181 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4181 newtype=T newtext:


@@ -11880,21 +11887,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4183 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4183 newtype=T newtext:


@@ -12054,21 +12061,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4185 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4185 newtype=T newtext:


@@ -12228,21 +12235,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4187 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4187 newtype=T newtext:


@@ -12402,21 +12409,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4189 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4189 newtype=T newtext:


@@ -12576,21 +12583,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4191 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4191 newtype=T newtext:


@@ -12750,21 +12757,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4193 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4193 newtype=T newtext:


@@ -12924,21 +12931,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4195 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4195 newtype=T newtext:


@@ -13097,21 +13104,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4197 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4197 newtype=T newtext:


@@ -13270,21 +13277,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4199 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4199 newtype=T newtext:


@@ -13443,21 +13450,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4201 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4201 newtype=T newtext:


@@ -13616,21 +13623,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4203 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4203 newtype=T newtext:


@@ -13789,21 +13796,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4205 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4205 newtype=T newtext:


@@ -13962,21 +13969,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4207 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4207 newtype=T newtext:


@@ -14135,21 +14142,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4209 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4209 newtype=T newtext:


@@ -14308,21 +14315,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4211 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4211 newtype=T newtext:


@@ -14481,21 +14488,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4213 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4213 newtype=T newtext:


@@ -14653,21 +14660,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4215 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4215 newtype=T newtext:


@@ -14824,21 +14831,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4217 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4217 newtype=T newtext:


@@ -14994,21 +15001,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4219 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4219 newtype=T newtext:


@@ -15163,21 +15170,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4221 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4221 newtype=T newtext:


@@ -15331,21 +15338,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4223 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4223 newtype=T newtext:


@@ -15498,21 +15505,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4225 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4225 newtype=T newtext:


@@ -15664,21 +15671,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4227 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4227 newtype=T newtext:


@@ -15829,21 +15836,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4229 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4229 newtype=T newtext:


@@ -15993,21 +16000,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4231 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4231 newtype=T newtext:


@@ -16156,21 +16163,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4233 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4233 newtype=T newtext:


@@ -16318,21 +16325,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4235 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4235 newtype=T newtext:


@@ -16479,21 +16486,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4237 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4237 newtype=T newtext:


@@ -16639,21 +16646,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4239 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4239 newtype=T newtext:


@@ -16798,21 +16805,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4241 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4241 newtype=T newtext:


@@ -16956,21 +16963,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4243 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4243 newtype=T newtext:


@@ -17113,21 +17120,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4245 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4245 newtype=T newtext:


@@ -17269,21 +17276,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4247 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4247 newtype=T newtext:


@@ -17424,21 +17431,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4249 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4249 newtype=T newtext:


@@ -17578,21 +17585,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4251 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4251 newtype=T newtext:


@@ -17731,21 +17738,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4253 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4253 newtype=T newtext:


@@ -17883,21 +17890,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4255 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4255 newtype=T newtext:


@@ -18034,21 +18041,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4257 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4257 newtype=T newtext:


@@ -18184,21 +18191,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4259 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4259 newtype=T newtext:


@@ -18333,21 +18340,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4261 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4261 newtype=T newtext:


@@ -18481,21 +18488,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4263 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4263 newtype=T newtext:


@@ -18628,21 +18635,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4265 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4265 newtype=T newtext:


@@ -18774,21 +18781,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4267 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4267 newtype=T newtext:


@@ -18919,21 +18926,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4269 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4269 newtype=T newtext:


@@ -19063,21 +19070,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4271 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4271 newtype=T newtext:


@@ -19206,21 +19213,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4273 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4273 newtype=T newtext:


@@ -19348,21 +19355,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4275 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4275 newtype=T newtext:


@@ -19489,21 +19496,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4277 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4277 newtype=T newtext:


@@ -19629,21 +19636,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4279 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4279 newtype=T newtext:


@@ -19768,21 +19775,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4281 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4281 newtype=T newtext:


@@ -19906,21 +19913,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4283 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4283 newtype=T newtext:


@@ -20043,21 +20050,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4285 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4285 newtype=T newtext:


@@ -20179,21 +20186,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4287 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4287 newtype=T newtext:


@@ -20314,21 +20321,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4289 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4289 newtype=T newtext:


@@ -20448,21 +20455,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4291 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4291 newtype=T newtext:


@@ -20581,21 +20588,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4293 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4293 newtype=T newtext:


@@ -20713,21 +20720,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4295 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4295 newtype=T newtext:


@@ -20844,21 +20851,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4297 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4297 newtype=T newtext:


@@ -20974,21 +20981,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4299 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4299 newtype=T newtext:


@@ -21103,21 +21110,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4301 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4301 newtype=T newtext:


@@ -21231,21 +21238,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4303 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4303 newtype=T newtext:


@@ -21358,21 +21365,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4305 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4305 newtype=T newtext:


@@ -21484,21 +21491,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4307 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4307 newtype=T newtext:


@@ -21609,21 +21616,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4309 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4309 newtype=T newtext:


@@ -21733,21 +21740,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4311 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4311 newtype=T newtext:


@@ -21856,21 +21863,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4313 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4313 newtype=T newtext:


@@ -21978,21 +21985,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4315 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4315 newtype=T newtext:


@@ -22099,21 +22106,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4317 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4317 newtype=T newtext:


@@ -22219,21 +22226,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4319 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4319 newtype=T newtext:


@@ -22338,21 +22345,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4321 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4321 newtype=T newtext:


@@ -22456,21 +22463,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4323 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4323 newtype=T newtext:


@@ -22573,21 +22580,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4325 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4325 newtype=T newtext:


@@ -22689,21 +22696,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4327 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4327 newtype=T newtext:


@@ -22804,21 +22811,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4329 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4329 newtype=T newtext:


@@ -22918,21 +22925,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4331 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4331 newtype=T newtext:


@@ -23031,21 +23038,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4333 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4333 newtype=T newtext:


@@ -23143,21 +23150,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4335 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4335 newtype=T newtext:


@@ -23254,21 +23261,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4337 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4337 newtype=T newtext:


@@ -23364,21 +23371,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4339 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4339 newtype=T newtext:


@@ -23473,21 +23480,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4341 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4341 newtype=T newtext:


@@ -23581,21 +23588,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4343 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4343 newtype=T newtext:


@@ -23688,21 +23695,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4345 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4345 newtype=T newtext:


@@ -23794,21 +23801,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4347 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4347 newtype=T newtext:


@@ -23899,21 +23906,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4349 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4349 newtype=T newtext:


@@ -24003,21 +24010,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4351 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4351 newtype=T newtext:


@@ -24106,21 +24113,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4353 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4353 newtype=T newtext:


@@ -24208,21 +24215,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4355 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4355 newtype=T newtext:


@@ -24309,21 +24316,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4357 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4357 newtype=T newtext:


@@ -24409,21 +24416,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4359 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4359 newtype=T newtext:


@@ -24508,21 +24515,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4361 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4361 newtype=T newtext:


@@ -24606,21 +24613,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4363 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4363 newtype=T newtext:


@@ -24703,21 +24710,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4365 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4365 newtype=T newtext:


@@ -24799,21 +24806,21 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
     random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4367 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4367 newtype=T newtext:


@@ -24894,21 +24901,21 @@ To: random@rwtest.example,
 remainder: random@test.example,
     random@test.example,
     random@test.example
 remainder: random@test.example,
     random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4369 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4369 newtype=T newtext:


@@ -24988,21 +24995,21 @@ To: random@rwtest.example,
 **** debug string too long - truncated ****
 remainder: random@test.example,
     random@test.example
 **** debug string too long - truncated ****
 remainder: random@test.example,
     random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4371 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4371 newtype=T newtext:


@@ -25081,21 +25088,21 @@ To: random@rwtest.example,
     random@rwtest.example,
 **** debug string too long - truncated ****
 remainder: random@test.example
     random@rwtest.example,
 **** debug string too long - truncated ****
 remainder: random@test.example

-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*

 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example" opts=NULL
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example

 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4373 newtype=T newtext:
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4373 newtype=T newtext:


@@ -25176,33 +25183,33 @@ To: random@rwtest.example,
 remainder: 
 rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@myhost.test.ex>
 remainder: 
 rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@myhost.test.ex>

-address match: subject=CALLER@myhost.test.ex pattern=*@*
+address match test: subject=CALLER@myhost.test.ex pattern=*@*

 myhost.test.ex in "*"? yes (matched "*")
 CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
 myhost.test.ex in "*"? yes (matched "*")
 CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")

-search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="myhost.test.ex" partial=2 affix=*. starflags=0
-LRU list:
-  ;TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="myhost.test.ex"
-cached data used for lookup of myhost.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
-trying partial match *.myhost.test.ex
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="*.myhost.test.ex"
-cached data used for lookup of *.myhost.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
-trying partial match *.test.ex
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="*.test.ex"
-cached data used for lookup of *.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="myhost.test.ex" partial=2 affix=*. starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="myhost.test.ex" opts=NULL
+ cached data used for lookup of myhost.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup failed
+ trying partial match *.myhost.test.ex
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="*.myhost.test.ex" opts=NULL
+ cached data used for lookup of *.myhost.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup failed
+ trying partial match *.test.ex
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="*.test.ex" opts=NULL
+ cached data used for lookup of *.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup failed

 search_tidyup called
 >>Headers after rewriting and local additions:
 * To: random@test.example,
 search_tidyup called
 >>Headers after rewriting and local additions:
 * To: random@test.example,


@@ -25366,18 +25373,19 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 

+Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D

 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for r1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for r1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
+DSN: **** SPOOL_OUT - address: <r1@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
+Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H

 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>