Debug: indent lookup operations

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

diff --git a/test/stderr/0002 b/test/stderr/0002
index 281e3dcfd8989b144dac07a149478ad5c41b5cf0..41bf8840bb154be610e651bb42ca9d6972ad83a9 100644 (file)
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -1,164 +1,251 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+dropping to exim gid; retaining priv uid
+ ╭considering: primary_hostname: $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}
+  ╭considering: abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+  ├──expanding: abcd
+  ╰─────result: abcd
+  ╭considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
+  ├──expanding: \N^([ab]+)(\w+)$\N
+  ╰─────result: ^([ab]+)(\w+)$
+ ├──condition: match{abcd}{\N^([ab]+)(\w+)$\N}
+ ├─────result: true
+  ╭considering: $2$1}fail}
+  ├──expanding: $2$1
+  ╰─────result: 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}
+  ╭considering: wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+  ├──expanding: wxyz
+  ╰─────result: wxyz
+  ╭considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
+  ├──expanding: \N^([ab]+)(\w+)$\N
+  ╰─────result: ^([ab]+)(\w+)$
+ ├──condition: match{wxyz}{\N^([ab]+)(\w+)$\N}
+ ├─────result: false
+  ╭───scanning: $2$1}fail}
+  ├──expanding: $2$1
+  ├─────result: 
+  ╰───skipping: result is not used
+ ├failed to expand: match:  ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+ ├───error message: "if" failed and "fail" requested
+ ╰failure was forced
+ ╭considering: ${if eq {1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
+  ╭considering: 1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
+  ├──expanding: 1
+  ╰─────result: 1
+  ╭considering: 1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
+  ├──expanding: 1
+  ╰─────result: 1
+ ├──condition: eq {1}{1}
+ ├─────result: true
+  ╭considering: yes}{${lookup{xx}lsearch{/non/exist}}}}
+  ├──expanding: yes
+  ╰─────result: yes
+  ╭───scanning: ${lookup{xx}lsearch{/non/exist}}}}
+   ╭───scanning: xx}lsearch{/non/exist}}}}
+   ├──expanding: xx
+   ├─────result: xx
+   ╰───skipping: result is not used
+   ╭───scanning: /non/exist}}}}
+   ├──expanding: /non/exist
+   ├─────result: /non/exist
+   ╰───skipping: result is not used
+  ├──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}}
+  ╭considering: a.b.c}{a.b.c}{yes}{no}}
+  ├──expanding: a.b.c
+  ╰─────result: a.b.c
+  ╭considering: a.b.c}{yes}{no}}
+  ├──expanding: a.b.c
+  ╰─────result: a.b.c
+LOG: MAIN PANIC
+  no @ found in the subject of an address list match: subject="a.b.c" pattern="a.b.c"
+ ├──condition: match_address{a.b.c}{a.b.c}
+ ├─────result: false
+  ╭───scanning: yes}{no}}
+  ├──expanding: yes
+  ├─────result: yes
+  ╰───skipping: result is not used
+  ╭considering: no}}
+  ├──expanding: no
+  ╰─────result: no
+ ├──expanding: a.b.c
+ ╰─────result: match_address:   no
+>>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) 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
  /considering: primary_hostname: $primary_hostname

- |__expanding: primary_hostname: $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}
   /considering: abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
  \_____result: primary_hostname: myhost.test.ex
  /considering: match:  ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
   /considering: abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}

-  |__expanding: abcd
+  |--expanding: abcd

   \_____result: abcd
   /considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
   \_____result: abcd
   /considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}

-  |__expanding: \N^([ab]+)(\w+)$\N
+  |--expanding: \N^([ab]+)(\w+)$\N

   \_____result: ^([ab]+)(\w+)$
   \_____result: ^([ab]+)(\w+)$

- |__condition: match{abcd}{\N^([ab]+)(\w+)$\N}
- |_____result: true
+ |--condition: match{abcd}{\N^([ab]+)(\w+)$\N}
+ |-----result: true

   /considering: $2$1}fail}
   /considering: $2$1}fail}

-  |__expanding: $2$1
+  |--expanding: $2$1

   \_____result: cdab
   \_____result: cdab

- |__expanding: match:  ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+ |--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}
   /considering: wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
  \_____result: match:  cdab
  /considering: match:  ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
   /considering: wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}

-  |__expanding: wxyz
+  |--expanding: wxyz

   \_____result: wxyz
   /considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
   \_____result: wxyz
   /considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}

-  |__expanding: \N^([ab]+)(\w+)$\N
+  |--expanding: \N^([ab]+)(\w+)$\N

   \_____result: ^([ab]+)(\w+)$
   \_____result: ^([ab]+)(\w+)$

- |__condition: match{wxyz}{\N^([ab]+)(\w+)$\N}
- |_____result: false
-  /   scanning: $2$1}fail}
-  |__expanding: $2$1
-  |_____result: 
+ |--condition: match{wxyz}{\N^([ab]+)(\w+)$\N}
+ |-----result: false
+  /---scanning: $2$1}fail}
+  |--expanding: $2$1
+  |-----result: 

   \___skipping: result is not used
  |failed to expand: match:  ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
   \___skipping: result is not used
  |failed to expand: match:  ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}

- |___error message: "if" failed and "fail" requested
+ |---error message: "if" failed and "fail" requested

  \failure was forced
  /considering: ${if eq {1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
   /considering: 1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
  \failure was forced
  /considering: ${if eq {1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
   /considering: 1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}

-  |__expanding: 1
+  |--expanding: 1

   \_____result: 1
   /considering: 1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
   \_____result: 1
   /considering: 1}{yes}{${lookup{xx}lsearch{/non/exist}}}}

-  |__expanding: 1
+  |--expanding: 1

   \_____result: 1
   \_____result: 1

- |__condition: eq {1}{1}
- |_____result: true
+ |--condition: eq {1}{1}
+ |-----result: true

   /considering: yes}{${lookup{xx}lsearch{/non/exist}}}}
   /considering: yes}{${lookup{xx}lsearch{/non/exist}}}}

-  |__expanding: yes
+  |--expanding: yes

   \_____result: yes
   \_____result: yes

-  /   scanning: ${lookup{xx}lsearch{/non/exist}}}}
-   /   scanning: xx}lsearch{/non/exist}}}}
-   |__expanding: xx
-   |_____result: xx
+  /---scanning: ${lookup{xx}lsearch{/non/exist}}}}
+   /---scanning: xx}lsearch{/non/exist}}}}
+   |--expanding: xx
+   |-----result: xx

    \___skipping: result is not used
    \___skipping: result is not used

-   /   scanning: /non/exist}}}}
-   |__expanding: /non/exist
-   |_____result: /non/exist
+   /---scanning: /non/exist}}}}
+   |--expanding: /non/exist
+   |-----result: /non/exist

    \___skipping: result is not used
    \___skipping: result is not used

-  |__expanding: ${lookup{xx}lsearch{/non/exist}}
-  |_____result: 
+  |--expanding: ${lookup{xx}lsearch{/non/exist}}
+  |-----result: 

   \___skipping: result is not used
   \___skipping: result is not used

- |__expanding: ${if eq {1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
+ |--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}}
   /considering: a.b.c}{a.b.c}{yes}{no}}
  \_____result: yes
  /considering: match_address:   ${if match_address{a.b.c}{a.b.c}{yes}{no}}
   /considering: a.b.c}{a.b.c}{yes}{no}}

-  |__expanding: a.b.c
+  |--expanding: a.b.c

   \_____result: a.b.c
   /considering: a.b.c}{yes}{no}}
   \_____result: a.b.c
   /considering: a.b.c}{yes}{no}}

-  |__expanding: a.b.c
+  |--expanding: a.b.c

   \_____result: a.b.c
 LOG: MAIN PANIC
   no @ found in the subject of an address list match: subject="a.b.c" pattern="a.b.c"
   \_____result: a.b.c
 LOG: MAIN PANIC
   no @ found in the subject of an address list match: subject="a.b.c" pattern="a.b.c"

- |__condition: match_address{a.b.c}{a.b.c}
- |_____result: false
-  /   scanning: yes}{no}}
-  |__expanding: yes
-  |_____result: yes
+ |--condition: match_address{a.b.c}{a.b.c}
+ |-----result: false
+  /---scanning: yes}{no}}
+  |--expanding: yes
+  |-----result: yes

   \___skipping: result is not used
   /considering: no}}
   \___skipping: result is not used
   /considering: no}}

-  |__expanding: no
+  |--expanding: no

   \_____result: no
   \_____result: no

- |__expanding: match_address:   ${if match_address{a.b.c}{a.b.c}{yes}{no}}
+ |--expanding: a.b.c

  \_____result: match_address:   no
  \_____result: match_address:   no

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

- /considering: -oMa  sender_host_address = $sender_host_address
- |__expanding: -oMa  sender_host_address = $sender_host_address
- \_____result: -oMa  sender_host_address = V4NET.0.0.1
- /considering:       sender_host_port = $sender_host_port
- |__expanding:       sender_host_port = $sender_host_port
- \_____result:       sender_host_port = 1234
- /considering: -oMaa sender_host_authenticated = $sender_host_authenticated
- |__expanding: -oMaa sender_host_authenticated = $sender_host_authenticated
- \_____result: -oMaa sender_host_authenticated = AAA
- /considering: -oMai authenticated_id = $authenticated_id
- |__expanding: -oMai authenticated_id = $authenticated_id
- \_____result: -oMai authenticated_id = philip
- /considering: -oMas authenticated_sender = $authenticated_sender
- |__expanding: -oMas authenticated_sender = $authenticated_sender
- \_____result: -oMas authenticated_sender = xx@yy.zz
- /considering: -oMi  interface_address = $interface_address
- |__expanding: -oMi  interface_address = $interface_address
- \_____result: -oMi  interface_address = 1.1.1.1
- /considering:       interface_port = $interface_port
- |__expanding:       interface_port = $interface_port
- \_____result:       interface_port = 99
- /considering: -oMr  received_protocol = $received_protocol
- |__expanding: -oMr  received_protocol = $received_protocol
- \_____result: -oMr  received_protocol = special
- /considering: -oMt  sender_ident = $sender_ident
- |__expanding: -oMt  sender_ident = $sender_ident
- \_____result: -oMt  sender_ident = me
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+dropping to exim gid; retaining priv uid
+ ╭considering: -oMa  sender_host_address = $sender_host_address
+ ├──expanding: -oMa  sender_host_address = $sender_host_address
+ ╰─────result: -oMa  sender_host_address = V4NET.0.0.1
+ ╭considering:       sender_host_port = $sender_host_port
+ ├──expanding:       sender_host_port = $sender_host_port
+ ╰─────result:       sender_host_port = 1234
+ ╭considering: -oMaa sender_host_authenticated = $sender_host_authenticated
+ ├──expanding: -oMaa sender_host_authenticated = $sender_host_authenticated
+ ╰─────result: -oMaa sender_host_authenticated = AAA
+ ╭considering: -oMai authenticated_id = $authenticated_id
+ ├──expanding: -oMai authenticated_id = $authenticated_id
+ ╰─────result: -oMai authenticated_id = philip
+ ╭considering: -oMas authenticated_sender = $authenticated_sender
+ ├──expanding: -oMas authenticated_sender = $authenticated_sender
+ ╰─────result: -oMas authenticated_sender = xx@yy.zz
+ ╭considering: -oMi  interface_address = $interface_address
+ ├──expanding: -oMi  interface_address = $interface_address
+ ╰─────result: -oMi  interface_address = 1.1.1.1
+ ╭considering:       interface_port = $interface_port
+ ├──expanding:       interface_port = $interface_port
+ ╰─────result:       interface_port = 99
+ ╭considering: -oMr  received_protocol = $received_protocol
+ ├──expanding: -oMr  received_protocol = $received_protocol
+ ╰─────result: -oMr  received_protocol = special
+ ╭considering: -oMt  sender_ident = $sender_ident
+ ├──expanding: -oMt  sender_ident = $sender_ident
+ ╰─────result: -oMt  sender_ident = me
+>>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) 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
 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

- /considering: -oMa  sender_host_address = $sender_host_address
- |__expanding: -oMa  sender_host_address = $sender_host_address
- \_____result: -oMa  sender_host_address = V4NET.0.0.1
- /considering:       sender_host_port = $sender_host_port
- |__expanding:       sender_host_port = $sender_host_port
- \_____result:       sender_host_port = 1234
- /considering: -oMaa sender_host_authenticated = $sender_host_authenticated
- |__expanding: -oMaa sender_host_authenticated = $sender_host_authenticated
- \_____result: -oMaa sender_host_authenticated = AAA
- /considering: -oMai authenticated_id = $authenticated_id
- |__expanding: -oMai authenticated_id = $authenticated_id
- \_____result: -oMai authenticated_id = philip
- /considering: -oMas authenticated_sender = $authenticated_sender
- |__expanding: -oMas authenticated_sender = $authenticated_sender
- \_____result: -oMas authenticated_sender = xx@yy.zz
- /considering: -oMi  interface_address = $interface_address
- |__expanding: -oMi  interface_address = $interface_address
- \_____result: -oMi  interface_address = 1.1.1.1
- /considering:       interface_port = $interface_port
- |__expanding:       interface_port = $interface_port
- \_____result:       interface_port = 99
- /considering: -oMr  received_protocol = $received_protocol
- |__expanding: -oMr  received_protocol = $received_protocol
- \_____result: -oMr  received_protocol = special
- /considering: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}}
-  /considering: black}{white}{$sender_host_name}{No}}
-  |__expanding: black
-  \_____result: black
-  /considering: white}{$sender_host_name}{No}}
-  |__expanding: white
-  \_____result: white
- |__condition: eq{black}{white}
- |_____result: false
-  /   scanning: $sender_host_name}{No}}
-  |__expanding: $sender_host_name
-  |_____result: 
-  \___skipping: result is not used
-  /considering: No}}
-  |__expanding: No
-  \_____result: 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
+dropping to exim gid; retaining priv uid
+ ╭considering: -oMa  sender_host_address = $sender_host_address
+ ├──expanding: -oMa  sender_host_address = $sender_host_address
+ ╰─────result: -oMa  sender_host_address = V4NET.0.0.1
+ ╭considering:       sender_host_port = $sender_host_port
+ ├──expanding:       sender_host_port = $sender_host_port
+ ╰─────result:       sender_host_port = 1234
+ ╭considering: -oMaa sender_host_authenticated = $sender_host_authenticated
+ ├──expanding: -oMaa sender_host_authenticated = $sender_host_authenticated
+ ╰─────result: -oMaa sender_host_authenticated = AAA
+ ╭considering: -oMai authenticated_id = $authenticated_id
+ ├──expanding: -oMai authenticated_id = $authenticated_id
+ ╰─────result: -oMai authenticated_id = philip
+ ╭considering: -oMas authenticated_sender = $authenticated_sender
+ ├──expanding: -oMas authenticated_sender = $authenticated_sender
+ ╰─────result: -oMas authenticated_sender = xx@yy.zz
+ ╭considering: -oMi  interface_address = $interface_address
+ ├──expanding: -oMi  interface_address = $interface_address
+ ╰─────result: -oMi  interface_address = 1.1.1.1
+ ╭considering:       interface_port = $interface_port
+ ├──expanding:       interface_port = $interface_port
+ ╰─────result:       interface_port = 99
+ ╭considering: -oMr  received_protocol = $received_protocol
+ ├──expanding: -oMr  received_protocol = $received_protocol
+ ╰─────result: -oMr  received_protocol = special
+ ╭considering: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}}
+  ╭considering: black}{white}{$sender_host_name}{No}}
+  ├──expanding: black
+  ╰─────result: black
+  ╭considering: white}{$sender_host_name}{No}}
+  ├──expanding: white
+  ╰─────result: white
+ ├──condition: eq{black}{white}
+ ├─────result: false
+  ╭───scanning: $sender_host_name}{No}}
+  ├──expanding: $sender_host_name
+  ├─────result: 
+  ╰───skipping: result is not used
+  ╭considering: No}}
+  ├──expanding: No
+  ╰─────result: 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

 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 
 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 


@@ -166,12 +253,12 @@ checking addresses for ten-1.test.ex
   V4NET.0.0.1 OK
 sender_fullhost = ten-1.test.ex [V4NET.0.0.1]
 sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1] ident=me)
   V4NET.0.0.1 OK
 sender_fullhost = ten-1.test.ex [V4NET.0.0.1]
 sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1] ident=me)

- |__expanding: -oMs  sender_host_name = $sender_host_name
- \_____result: -oMs  sender_host_name = ten-1.test.ex
- /considering: -oMt  sender_ident = $sender_ident
- |__expanding: -oMt  sender_ident = $sender_ident
- \_____result: -oMt  sender_ident = me
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+ ├──expanding: -oMs  sender_host_name = $sender_host_name
+ ╰─────result: -oMs  sender_host_name = ten-1.test.ex
+ ╭considering: -oMt  sender_ident = $sender_ident
+ ├──expanding: -oMt  sender_ident = $sender_ident
+ ╰─────result: -oMt  sender_ident = me
+>>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp


@@ -195,7 +282,7 @@ host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect1"
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect1"

-processing "deny"
+processing "deny" (TESTSUITE/test-config 45)

 check hosts = <\n partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch \n 1.2.3.4
 sender host name required, to match against partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch
 looking up host name for V4NET.0.0.1
 check hosts = <\n partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch \n 1.2.3.4
 sender host name required, to match against partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch
 looking up host name for V4NET.0.0.1


@@ -230,7 +317,7 @@ 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
 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 terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp


@@ -254,7 +341,7 @@ host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect2"
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect2"

-processing "deny"
+processing "deny" (TESTSUITE/test-config 48)

 check hosts = net-lsearch;TESTSUITE/aux-fixed/0002.lsearch
 search_open: lsearch "TESTSUITE/aux-fixed/0002.lsearch"
 search_find: file="TESTSUITE/aux-fixed/0002.lsearch"
 check hosts = net-lsearch;TESTSUITE/aux-fixed/0002.lsearch
 search_open: lsearch "TESTSUITE/aux-fixed/0002.lsearch"
 search_find: file="TESTSUITE/aux-fixed/0002.lsearch"


@@ -274,7 +361,7 @@ SMTP>> 550 Administrative prohibition
 LOG: connection_reject MAIN REJECT
   H=[V4NET.0.0.2] rejected connection in "connect" ACL
 search_tidyup called
 LOG: connection_reject MAIN REJECT
   H=[V4NET.0.0.2] rejected connection in "connect" ACL
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) 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)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -284,79 +371,79 @@ search_tidyup called
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect0"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect0"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 42)

 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT
 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 70)

 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> using ACL "check_data"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> using ACL "check_data"

->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 51)

 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: ""
 LOG: 10HmaX-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: ""
 LOG: 10HmaX-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 52)

 >>>   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=<>
 >>>   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=<>

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 70)

 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"

->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 51)

 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: ""
 LOG: 10HmaY-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: ""
 LOG: 10HmaY-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 52)

 >>>   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>
 >>>   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>

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 70)

 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"

->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 51)

 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: ""
 LOG: 10HmaZ-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: ""
 LOG: 10HmaZ-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 52)

 >>>   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>
 >>>   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>

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 70)

 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"

->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 51)

 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: ""
 LOG: 10HmbA-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: ""
 LOG: 10HmbA-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 52)

 >>>   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=<>
 >>>   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=<>

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 70)

 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"

->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 51)

 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: ""
 LOG: 10HmbB-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"
 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: ""
 LOG: 10HmbB-0005vi-00 Subject is: ""
 >>> warn: condition test succeeded in ACL "check_data"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 52)

 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY


@@ -370,20 +457,20 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect0"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect0"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 42)

 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT
 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 70)

 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"

->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 51)

 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_over_the_75-char_limit_by_a_long_way=3B_in_fact_this_one_will_go_over_the_150_character_limit?="
 LOG: 10HmbC-0005vi-00 Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_over_the_75-char_limit_by_a_long_way=3B_in_fact_this_one_will_go_over_the_150_character_limit?="
 >>> warn: condition test succeeded in ACL "check_data"
 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_over_the_75-char_limit_by_a_long_way=3B_in_fact_this_one_will_go_over_the_150_character_limit?="
 LOG: 10HmbC-0005vi-00 Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_over_the_75-char_limit_by_a_long_way=3B_in_fact_this_one_will_go_over_the_150_character_limit?="
 >>> warn: condition test succeeded in ACL "check_data"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 52)

 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY


@@ -397,20 +484,20 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect0"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect0"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 42)

 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT
 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 70)

 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"

->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 51)

 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: " here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit"
 LOG: 10HmbD-0005vi-00 Subject is: " here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit"
 >>> warn: condition test succeeded in ACL "check_data"
 >>> check logwrite = Subject is: "$h_subject:"
 >>>                = Subject is: " here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit"
 LOG: 10HmbD-0005vi-00 Subject is: " here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit"
 >>> warn: condition test succeeded in ACL "check_data"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 52)

 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY


@@ -420,9 +507,10 @@ changed uid/gid: -C, -D, -be or -bf forces real uid
   uid=CALLER_UID gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
   uid=CALLER_UID gid=CALLER_GID pid=pppp
 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)
 search_tidyup called
 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)
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>