X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/3db72f4b639a64cacf152e4f7718a18581426b10..18e8acda27c24cb66295071e4b21c1a73ca83e40:/test/stderr/0002

diff --git a/test/stderr/0002 b/test/stderr/0002
index bd2d8067f..2f48f709f 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -3,36 +3,61 @@ configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
  ╭considering: primary_hostname: $primary_hostname
+ ├───────text: primary_hostname: 
+ ├considering: $primary_hostname
  ├──expanding: primary_hostname: $primary_hostname
  ╰─────result: primary_hostname: myhost.test.ex
  ╭considering: sender_address: $sender_address
+ ├───────text: sender_address: 
+ ├considering: $sender_address
  ├──expanding: sender_address: $sender_address
  ╰─────result: sender_address: sndr@dom
             ╰──(tainted)
  ╭considering: match:  ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+ ├───────text: match:  
+ ├considering: ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
   ╭considering: abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+  ├───────text: abcd
+  ├considering: }{\N^([ab]+)(\w+)$\N}{$2$1}fail}
   ├──expanding: abcd
   ╰─────result: abcd
   ╭considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
+  ├──protected: ^([ab]+)(\w+)$
+  ├considering: }{$2$1}fail}
   ├──expanding: \N^([ab]+)(\w+)$\N
   ╰─────result: ^([ab]+)(\w+)$
+ compiled RE '^([ab]+)(\w+)$' not found in local cache
+ compiling RE '^([ab]+)(\w+)$'
+ compiled RE '^([ab]+)(\w+)$' saved in local cache
  ├──condition: match{abcd}{\N^([ab]+)(\w+)$\N}
  ├─────result: true
   ╭considering: $2$1}fail}
+  ├considering: $1}fail}
+  ├considering: }fail}
   ├──expanding: $2$1
   ╰─────result: cdab
+ ├───item-res: cdab
  ├──expanding: match:  ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
  ╰─────result: match:  cdab
  ╭considering: match:  ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+ ├───────text: match:  
+ ├considering: ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
   ╭considering: wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+  ├───────text: wxyz
+  ├considering: }{\N^([ab]+)(\w+)$\N}{$2$1}fail}
   ├──expanding: wxyz
   ╰─────result: wxyz
   ╭considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
+  ├──protected: ^([ab]+)(\w+)$
+  ├considering: }{$2$1}fail}
   ├──expanding: \N^([ab]+)(\w+)$\N
   ╰─────result: ^([ab]+)(\w+)$
+ compiled RE '^([ab]+)(\w+)$' found in local cache
  ├──condition: match{wxyz}{\N^([ab]+)(\w+)$\N}
  ├─────result: false
   ╭───scanning: $2$1}fail}
+  ├───scanning: $1}fail}
+  ├───scanning: }fail}
   ├──expanding: $2$1
   ├─────result: 
   ╰───skipping: result is not used
@@ -41,35 +66,52 @@ dropping to exim gid; retaining priv uid
  ╰failure was forced
  ╭considering: ${if eq {1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
   ╭considering: 1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
+  ├───────text: 1
+  ├considering: }{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
   ├──expanding: 1
   ╰─────result: 1
   ╭considering: 1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
+  ├───────text: 1
+  ├considering: }{yes}{${lookup{xx}lsearch{/non/exist}}}}
   ├──expanding: 1
   ╰─────result: 1
  ├──condition: eq {1}{1}
  ├─────result: true
   ╭considering: yes}{${lookup{xx}lsearch{/non/exist}}}}
+  ├───────text: yes
+  ├considering: }{${lookup{xx}lsearch{/non/exist}}}}
   ├──expanding: yes
   ╰─────result: yes
   ╭───scanning: ${lookup{xx}lsearch{/non/exist}}}}
    ╭───scanning: xx}lsearch{/non/exist}}}}
+   ├───────text: xx
+   ├───scanning: }lsearch{/non/exist}}}}
    ├──expanding: xx
    ├─────result: xx
    ╰───skipping: result is not used
    ╭───scanning: /non/exist}}}}
+   ├───────text: /non/exist
+   ├───scanning: }}}}
    ├──expanding: /non/exist
    ├─────result: /non/exist
    ╰───skipping: result is not used
+  ├───scanning: }}
   ├──expanding: ${lookup{xx}lsearch{/non/exist}}
   ├─────result: 
   ╰───skipping: result is not used
  ├──expanding: ${if eq {1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
  ╰─────result: yes
  ╭considering: match_address:   ${if match_address{a.b.c}{a.b.c}{yes}{no}}
+ ├───────text: match_address:   
+ ├considering: ${if match_address{a.b.c}{a.b.c}{yes}{no}}
   ╭considering: a.b.c}{a.b.c}{yes}{no}}
+  ├───────text: a.b.c
+  ├considering: }{a.b.c}{yes}{no}}
   ├──expanding: a.b.c
   ╰─────result: a.b.c
   ╭considering: a.b.c}{yes}{no}}
+  ├───────text: a.b.c
+  ├considering: }{yes}{no}}
   ├──expanding: a.b.c
   ╰─────result: a.b.c
 LOG: MAIN PANIC
@@ -77,46 +119,74 @@ LOG: MAIN PANIC
  ├──condition: match_address{a.b.c}{a.b.c}
  ├─────result: false
   ╭───scanning: yes}{no}}
+  ├───────text: yes
+  ├───scanning: }{no}}
   ├──expanding: yes
   ├─────result: yes
   ╰───skipping: result is not used
   ╭considering: no}}
+  ├───────text: no
+  ├considering: }}
   ├──expanding: no
   ╰─────result: no
+ ├───item-res: no
  ├──expanding: match_address:   ${if match_address{a.b.c}{a.b.c}{yes}{no}}
  ╰─────result: match_address:   no
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
  /considering: primary_hostname: $primary_hostname
+ |-------text: primary_hostname: 
+ |considering: $primary_hostname
  |--expanding: primary_hostname: $primary_hostname
  \_____result: primary_hostname: myhost.test.ex
  /considering: match:  ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+ |-------text: match:  
+ |considering: ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
   /considering: abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+  |-------text: abcd
+  |considering: }{\N^([ab]+)(\w+)$\N}{$2$1}fail}
   |--expanding: abcd
   \_____result: abcd
   /considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
+  |--protected: ^([ab]+)(\w+)$
+  |considering: }{$2$1}fail}
   |--expanding: \N^([ab]+)(\w+)$\N
   \_____result: ^([ab]+)(\w+)$
+ compiled RE '^([ab]+)(\w+)$' not found in local cache
+ compiling RE '^([ab]+)(\w+)$'
+ compiled RE '^([ab]+)(\w+)$' saved in local cache
  |--condition: match{abcd}{\N^([ab]+)(\w+)$\N}
  |-----result: true
   /considering: $2$1}fail}
+  |considering: $1}fail}
+  |considering: }fail}
   |--expanding: $2$1
   \_____result: cdab
+ |---item-res: cdab
  |--expanding: match:  ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
  \_____result: match:  cdab
  /considering: match:  ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+ |-------text: match:  
+ |considering: ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
   /considering: wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+  |-------text: wxyz
+  |considering: }{\N^([ab]+)(\w+)$\N}{$2$1}fail}
   |--expanding: wxyz
   \_____result: wxyz
   /considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
+  |--protected: ^([ab]+)(\w+)$
+  |considering: }{$2$1}fail}
   |--expanding: \N^([ab]+)(\w+)$\N
   \_____result: ^([ab]+)(\w+)$
+ compiled RE '^([ab]+)(\w+)$' found in local cache
  |--condition: match{wxyz}{\N^([ab]+)(\w+)$\N}
  |-----result: false
   /---scanning: $2$1}fail}
+  |---scanning: $1}fail}
+  |---scanning: }fail}
   |--expanding: $2$1
   |-----result: 
   \___skipping: result is not used
@@ -125,35 +195,52 @@ dropping to exim gid; retaining priv uid
  \failure was forced
  /considering: ${if eq {1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
   /considering: 1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
+  |-------text: 1
+  |considering: }{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
   |--expanding: 1
   \_____result: 1
   /considering: 1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
+  |-------text: 1
+  |considering: }{yes}{${lookup{xx}lsearch{/non/exist}}}}
   |--expanding: 1
   \_____result: 1
  |--condition: eq {1}{1}
  |-----result: true
   /considering: yes}{${lookup{xx}lsearch{/non/exist}}}}
+  |-------text: yes
+  |considering: }{${lookup{xx}lsearch{/non/exist}}}}
   |--expanding: yes
   \_____result: yes
   /---scanning: ${lookup{xx}lsearch{/non/exist}}}}
    /---scanning: xx}lsearch{/non/exist}}}}
+   |-------text: xx
+   |---scanning: }lsearch{/non/exist}}}}
    |--expanding: xx
    |-----result: xx
    \___skipping: result is not used
    /---scanning: /non/exist}}}}
+   |-------text: /non/exist
+   |---scanning: }}}}
    |--expanding: /non/exist
    |-----result: /non/exist
    \___skipping: result is not used
+  |---scanning: }}
   |--expanding: ${lookup{xx}lsearch{/non/exist}}
   |-----result: 
   \___skipping: result is not used
  |--expanding: ${if eq {1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
  \_____result: yes
  /considering: match_address:   ${if match_address{a.b.c}{a.b.c}{yes}{no}}
+ |-------text: match_address:   
+ |considering: ${if match_address{a.b.c}{a.b.c}{yes}{no}}
   /considering: a.b.c}{a.b.c}{yes}{no}}
+  |-------text: a.b.c
+  |considering: }{a.b.c}{yes}{no}}
   |--expanding: a.b.c
   \_____result: a.b.c
   /considering: a.b.c}{yes}{no}}
+  |-------text: a.b.c
+  |considering: }{yes}{no}}
   |--expanding: a.b.c
   \_____result: a.b.c
 LOG: MAIN PANIC
@@ -161,108 +248,159 @@ LOG: MAIN PANIC
  |--condition: match_address{a.b.c}{a.b.c}
  |-----result: false
   /---scanning: yes}{no}}
+  |-------text: yes
+  |---scanning: }{no}}
   |--expanding: yes
   |-----result: yes
   \___skipping: result is not used
   /considering: no}}
+  |-------text: no
+  |considering: }}
   |--expanding: no
   \_____result: no
+ |---item-res: no
  |--expanding: match_address:   ${if match_address{a.b.c}{a.b.c}{yes}{no}}
  \_____result: match_address:   no
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
  ╭considering: -oMa  sender_host_address = $sender_host_address
+ ├───────text: -oMa  sender_host_address = 
+ ├considering: $sender_host_address
  ├──expanding: -oMa  sender_host_address = $sender_host_address
  ╰─────result: -oMa  sender_host_address = V4NET.0.0.1
             ╰──(tainted)
  ╭considering:       sender_host_port = $sender_host_port
+ ├───────text:       sender_host_port = 
+ ├considering: $sender_host_port
  ├──expanding:       sender_host_port = $sender_host_port
  ╰─────result:       sender_host_port = 1234
  ╭considering: -oMaa sender_host_authenticated = $sender_host_authenticated
+ ├───────text: -oMaa sender_host_authenticated = 
+ ├considering: $sender_host_authenticated
  ├──expanding: -oMaa sender_host_authenticated = $sender_host_authenticated
  ╰─────result: -oMaa sender_host_authenticated = AAA
             ╰──(tainted)
  ╭considering: -oMai authenticated_id = $authenticated_id
+ ├───────text: -oMai authenticated_id = 
+ ├considering: $authenticated_id
  ├──expanding: -oMai authenticated_id = $authenticated_id
  ╰─────result: -oMai authenticated_id = philip
             ╰──(tainted)
  ╭considering: -oMas authenticated_sender = $authenticated_sender
+ ├───────text: -oMas authenticated_sender = 
+ ├considering: $authenticated_sender
  ├──expanding: -oMas authenticated_sender = $authenticated_sender
  ╰─────result: -oMas authenticated_sender = xx@yy.zz
             ╰──(tainted)
  ╭considering: -oMi  interface_address = $interface_address
+ ├───────text: -oMi  interface_address = 
+ ├considering: $interface_address
  ├──expanding: -oMi  interface_address = $interface_address
  ╰─────result: -oMi  interface_address = 1.1.1.1
             ╰──(tainted)
  ╭considering:       interface_port = $interface_port
+ ├───────text:       interface_port = 
+ ├considering: $interface_port
  ├──expanding:       interface_port = $interface_port
  ╰─────result:       interface_port = 99
  ╭considering: -oMr  received_protocol = $received_protocol
+ ├───────text: -oMr  received_protocol = 
+ ├considering: $received_protocol
  ├──expanding: -oMr  received_protocol = $received_protocol
  ╰─────result: -oMr  received_protocol = special
             ╰──(tainted)
  ╭considering: -oMt  sender_ident = $sender_ident
+ ├───────text: -oMt  sender_ident = 
+ ├considering: $sender_ident
  ├──expanding: -oMt  sender_ident = $sender_ident
  ╰─────result: -oMt  sender_ident = me
             ╰──(tainted)
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 1999-03-02 09:44:33 no host name found for IP address V4NET.11.12.13
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
  ╭considering: -oMa  sender_host_address = $sender_host_address
+ ├───────text: -oMa  sender_host_address = 
+ ├considering: $sender_host_address
  ├──expanding: -oMa  sender_host_address = $sender_host_address
  ╰─────result: -oMa  sender_host_address = V4NET.0.0.1
             ╰──(tainted)
  ╭considering:       sender_host_port = $sender_host_port
+ ├───────text:       sender_host_port = 
+ ├considering: $sender_host_port
  ├──expanding:       sender_host_port = $sender_host_port
  ╰─────result:       sender_host_port = 1234
  ╭considering: -oMaa sender_host_authenticated = $sender_host_authenticated
+ ├───────text: -oMaa sender_host_authenticated = 
+ ├considering: $sender_host_authenticated
  ├──expanding: -oMaa sender_host_authenticated = $sender_host_authenticated
  ╰─────result: -oMaa sender_host_authenticated = AAA
             ╰──(tainted)
  ╭considering: -oMai authenticated_id = $authenticated_id
+ ├───────text: -oMai authenticated_id = 
+ ├considering: $authenticated_id
  ├──expanding: -oMai authenticated_id = $authenticated_id
  ╰─────result: -oMai authenticated_id = philip
             ╰──(tainted)
  ╭considering: -oMas authenticated_sender = $authenticated_sender
+ ├───────text: -oMas authenticated_sender = 
+ ├considering: $authenticated_sender
  ├──expanding: -oMas authenticated_sender = $authenticated_sender
  ╰─────result: -oMas authenticated_sender = xx@yy.zz
             ╰──(tainted)
  ╭considering: -oMi  interface_address = $interface_address
+ ├───────text: -oMi  interface_address = 
+ ├considering: $interface_address
  ├──expanding: -oMi  interface_address = $interface_address
  ╰─────result: -oMi  interface_address = 1.1.1.1
             ╰──(tainted)
  ╭considering:       interface_port = $interface_port
+ ├───────text:       interface_port = 
+ ├considering: $interface_port
  ├──expanding:       interface_port = $interface_port
  ╰─────result:       interface_port = 99
  ╭considering: -oMr  received_protocol = $received_protocol
+ ├───────text: -oMr  received_protocol = 
+ ├considering: $received_protocol
  ├──expanding: -oMr  received_protocol = $received_protocol
  ╰─────result: -oMr  received_protocol = special
             ╰──(tainted)
  ╭considering: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}}
+ ├───────text: ----> No lookup yet: 
+ ├considering: ${if eq{black}{white}{$sender_host_name}{No}}
   ╭considering: black}{white}{$sender_host_name}{No}}
+  ├───────text: black
+  ├considering: }{white}{$sender_host_name}{No}}
   ├──expanding: black
   ╰─────result: black
   ╭considering: white}{$sender_host_name}{No}}
+  ├───────text: white
+  ├considering: }{$sender_host_name}{No}}
   ├──expanding: white
   ╰─────result: white
  ├──condition: eq{black}{white}
  ├─────result: false
   ╭───scanning: $sender_host_name}{No}}
+  ├───scanning: }{No}}
   ├──expanding: $sender_host_name
   ├─────result: 
   ╰───skipping: result is not used
   ╭considering: No}}
+  ├───────text: No
+  ├considering: }}
   ├──expanding: No
   ╰─────result: No
+ ├───item-res: No
  ├──expanding: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}}
  ╰─────result: ----> No lookup yet: No
  ╭considering: -oMs  sender_host_name = $sender_host_name
+ ├───────text: -oMs  sender_host_name = 
+ ├considering: $sender_host_name
 looking up host name for V4NET.0.0.1
 IP address lookup yielded "ten-1.test.ex"
 ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
@@ -274,17 +412,19 @@ sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1] ident=me)
  ╰─────result: -oMs  sender_host_name = ten-1.test.ex
             ╰──(tainted)
  ╭considering: -oMt  sender_ident = $sender_ident
+ ├───────text: -oMt  sender_ident = 
+ ├considering: $sender_ident
  ├──expanding: -oMt  sender_ident = $sender_ident
  ╰─────result: -oMt  sender_ident = me
             ╰──(tainted)
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1238
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1238
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [V4NET.0.0.1]
@@ -337,14 +477,14 @@ SMTP>> 550 Administrative prohibition
 LOG: connection_reject MAIN REJECT
   H=ten-1.test.ex [V4NET.0.0.1] rejected connection in "connect" ACL
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1239
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1239
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [V4NET.0.0.2]
@@ -382,7 +522,7 @@ SMTP>> 550 Administrative prohibition
 LOG: connection_reject MAIN REJECT
   H=[V4NET.0.0.2] rejected connection in "connect" ACL
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -395,6 +535,7 @@ search_tidyup called
 >>> processing "accept" (TESTSUITE/test-config 42)
 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT
+>>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
@@ -408,7 +549,7 @@ LOG: 10HmaX-0005vi-00 Subject is: ""
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
-LOG: 10HmaX-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
+LOG: 10HmaX-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
@@ -423,7 +564,7 @@ LOG: 10HmaY-0005vi-00 Subject is: ""
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
-LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<a@b>
+LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<a@b>
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
@@ -438,7 +579,7 @@ LOG: 10HmaZ-0005vi-00 Subject is: ""
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
-LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<c@d>
+LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<c@d>
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
@@ -453,7 +594,7 @@ LOG: 10HmbA-0005vi-00 Subject is: ""
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
-LOG: 10HmbA-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
+LOG: 10HmbA-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
@@ -468,7 +609,7 @@ LOG: 10HmbB-0005vi-00 Subject is: ""
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
-LOG: 10HmbB-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x@y>
+LOG: 10HmbB-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x@y>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -481,6 +622,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x
 >>> processing "accept" (TESTSUITE/test-config 42)
 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT
+>>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
@@ -495,7 +637,7 @@ LOG: 10HmbC-0005vi-00 Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_i
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
-LOG: 10HmbC-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
+LOG: 10HmbC-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -508,6 +650,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 >>> processing "accept" (TESTSUITE/test-config 42)
 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT
+>>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
@@ -522,16 +665,16 @@ LOG: 10HmbD-0005vi-00 Subject is: " here we go: a string that is going to be enc
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
-LOG: 10HmbD-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
+LOG: 10HmbD-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 Exim version x.yz ....
 changed uid/gid: -C, -D, -be or -bf forces real uid
-  uid=CALLER_UID gid=CALLER_GID pid=pppp
+  uid=CALLER_UID gid=CALLER_GID pid=p1240
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
-1.2.3.4 in "1.2.3"? no (malformed IPv4 address or address mask)
-1.2.3.4 in "1.2.3.4/abc"? no (malformed IPv4 address or address mask)
+ 1.2.3.4 in "1.2.3"? no (malformed IPv4 address or address mask)
+ 1.2.3.4 in "1.2.3.4/abc"? no (malformed IPv4 address or address mask)
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>