X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d1af83598f7d6b32516a11bb28e569d592a05c48..de6273b487f1b5599894b09c1c8793ac22fb6cc8:/test/stderr/0002

diff --git a/test/stderr/0002 b/test/stderr/0002
index d94e3686a..e7c70cfbf 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -1,120 +1,164 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-expanding: primary_hostname: $primary_hostname
-   result: primary_hostname: myhost.test.ex
-expanding: abcd
-   result: abcd
-expanding: \N^([ab]+)(\w+)$\N
-   result: ^([ab]+)(\w+)$
-condition: match{abcd}{\N^([ab]+)(\w+)$\N}
-   result: true
-expanding: $2$1
-   result: cdab
-expanding: match:  ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
-   result: match:  cdab
-expanding: wxyz
-   result: wxyz
-expanding: \N^([ab]+)(\w+)$\N
-   result: ^([ab]+)(\w+)$
-condition: match{wxyz}{\N^([ab]+)(\w+)$\N}
-   result: false
-expanding: $2$1
-   result: 
-skipping: result is not used
+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
-expanding: 1
-   result: 1
-expanding: 1
-   result: 1
-condition: eq {1}{1}
-   result: true
-expanding: yes
-   result: yes
-expanding: xx
-   result: xx
-skipping: result is not used
-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
-expanding: a.b.c
-   result: a.b.c
-expanding: a.b.c
-   result: a.b.c
+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
-expanding: yes
-   result: yes
-skipping: result is not used
-expanding: no
-   result: no
-expanding: match_address:   ${if match_address{a.b.c}{a.b.c}{yes}{no}}
-   result: match_address:   no
+  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: match_address:   ${if match_address{a.b.c}{a.b.c}{yes}{no}}
+     result: match_address:   no
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-expanding: -oMa  sender_host_address = $sender_host_address
-   result: -oMa  sender_host_address = V4NET.0.0.1
-expanding:       sender_host_port = $sender_host_port
-   result:       sender_host_port = 1234
-expanding: -oMaa sender_host_authenticated = $sender_host_authenticated
-   result: -oMaa sender_host_authenticated = AAA
-expanding: -oMai authenticated_id = $authenticated_id
-   result: -oMai authenticated_id = philip
-expanding: -oMas authenticated_sender = $authenticated_sender
-   result: -oMas authenticated_sender = xx@yy.zz
-expanding: -oMi  interface_address = $interface_address
-   result: -oMi  interface_address = 1.1.1.1
-expanding:       interface_port = $interface_port
-   result:       interface_port = 99
-expanding: -oMr  received_protocol = $received_protocol
-   result: -oMr  received_protocol = special
-expanding: -oMt  sender_ident = $sender_ident
-   result: -oMt  sender_ident = me
+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 >>>>>>>>>>>>>>>>
 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
-expanding: -oMa  sender_host_address = $sender_host_address
-   result: -oMa  sender_host_address = V4NET.0.0.1
-expanding:       sender_host_port = $sender_host_port
-   result:       sender_host_port = 1234
-expanding: -oMaa sender_host_authenticated = $sender_host_authenticated
-   result: -oMaa sender_host_authenticated = AAA
-expanding: -oMai authenticated_id = $authenticated_id
-   result: -oMai authenticated_id = philip
-expanding: -oMas authenticated_sender = $authenticated_sender
-   result: -oMas authenticated_sender = xx@yy.zz
-expanding: -oMi  interface_address = $interface_address
-   result: -oMi  interface_address = 1.1.1.1
-expanding:       interface_port = $interface_port
-   result:       interface_port = 99
-expanding: -oMr  received_protocol = $received_protocol
-   result: -oMr  received_protocol = special
-expanding: black
-   result: black
-expanding: white
-   result: white
-condition: eq{black}{white}
-   result: false
-expanding: $sender_host_name
-   result: 
-skipping: result is not used
-expanding: No
-   result: No
-expanding: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}}
-   result: ----> No lookup yet: No
+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 
@@ -122,23 +166,15 @@ 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)
-expanding: -oMs  sender_host_name = $sender_host_name
-   result: -oMs  sender_host_name = ten-1.test.ex
-expanding: -oMt  sender_ident = $sender_ident
-   result: -oMt  sender_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 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
-PATH in keep_environment? no (end of list)
-PWD in keep_environment? no (end of list)
-SHELL in keep_environment? no (end of list)
-TERM in keep_environment? no (end of list)
-USER in keep_environment? yes (matched "USER")
-USER in keep_environment? yes (matched "USER")
-USER in keep_environment? yes (matched "USER")
-USER in keep_environment? yes (matched "USER")
-USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -191,22 +227,13 @@ host in "<
 deny: condition test succeeded in ACL "connect1"
 end of ACL "connect1": DENY
 SMTP>> 550 Administrative prohibition
-LOG: MAIN REJECT
+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 version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
-PATH in keep_environment? no (end of list)
-PWD in keep_environment? no (end of list)
-SHELL in keep_environment? no (end of list)
-TERM in keep_environment? no (end of list)
-USER in keep_environment? yes (matched "USER")
-USER in keep_environment? yes (matched "USER")
-USER in keep_environment? yes (matched "USER")
-USER in keep_environment? yes (matched "USER")
-USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -244,7 +271,7 @@ host in "net-lsearch;TESTSUITE/aux-fixed/0002.lsearch"? no (end of list)
 deny: condition test failed in ACL "connect2"
 end of ACL "connect2": implicit DENY
 SMTP>> 550 Administrative prohibition
-LOG: MAIN REJECT
+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 >>>>>>>>>>>>>>>>
@@ -391,15 +418,6 @@ LOG: 10HmbD-0005vi-00 H=[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
-PATH in keep_environment? no (end of list)
-PWD in keep_environment? no (end of list)
-SHELL in keep_environment? no (end of list)
-TERM in keep_environment? no (end of list)
-USER in keep_environment? yes (matched "USER")
-USER in keep_environment? yes (matched "USER")
-USER in keep_environment? yes (matched "USER")
-USER in keep_environment? yes (matched "USER")
-USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME