Fix taint hybrid-checking on BSD

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

diff --git a/test/stderr/0002 b/test/stderr/0002
index 0677a429125821a380598dbe4d0ad8b618e35a95..8f85e71460704dbc1d655aaedf4a13e25ef07b48 100644 (file)
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -1,89 +1,95 @@
 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: primary_hostname: $primary_hostname
+dropping to exim gid; retaining priv uid
+ ╭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: sender_address: $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}
+  ╭considering: abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}

   ├──expanding: abcd
   ├──expanding: abcd

-  â\94\94─────result: abcd
-  â\94\8cconsidering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
+  â\95°─────result: abcd
+  â\95­considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}

   ├──expanding: \N^([ab]+)(\w+)$\N
   ├──expanding: \N^([ab]+)(\w+)$\N

-  â\94\94─────result: ^([ab]+)(\w+)$
+  â\95°─────result: ^([ab]+)(\w+)$

  ├──condition: match{abcd}{\N^([ab]+)(\w+)$\N}
  ├─────result: true
  ├──condition: match{abcd}{\N^([ab]+)(\w+)$\N}
  ├─────result: true

-  â\94\8cconsidering: $2$1}fail}
+  â\95­considering: $2$1}fail}

   ├──expanding: $2$1
   ├──expanding: $2$1

-  â\94\94─────result: cdab
+  â\95°─────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}

- â\94\94─────result: match:  cdab
- â\94\8cconsidering: match:  ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
-  â\94\8cconsidering: wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+ â\95°─────result: match:  cdab
+ â\95­considering: match:  ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
+  â\95­considering: wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}

   ├──expanding: wxyz
   ├──expanding: wxyz

-  â\94\94─────result: wxyz
-  â\94\8cconsidering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
+  â\95°─────result: wxyz
+  â\95­considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}

   ├──expanding: \N^([ab]+)(\w+)$\N
   ├──expanding: \N^([ab]+)(\w+)$\N

-  â\94\94─────result: ^([ab]+)(\w+)$
+  â\95°─────result: ^([ab]+)(\w+)$

  ├──condition: match{wxyz}{\N^([ab]+)(\w+)$\N}
  ├─────result: false
  ├──condition: match{wxyz}{\N^([ab]+)(\w+)$\N}
  ├─────result: false

-  â\94\8c───scanning: $2$1}fail}
+  â\95­───scanning: $2$1}fail}

   ├──expanding: $2$1
   ├─────result: 
   ├──expanding: $2$1
   ├─────result: 

-  â\94\94───skipping: result is not used
+  â\95°───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
  ├failed to expand: match:  ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
  ├───error message: "if" failed and "fail" requested

- â\94\94failure was forced
- â\94\8cconsidering: ${if eq {1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
-  â\94\8cconsidering: 1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
+ â\95°failure was forced
+ â\95­considering: ${if eq {1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
+  â\95­considering: 1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}

   ├──expanding: 1
   ├──expanding: 1

-  â\94\94─────result: 1
-  â\94\8cconsidering: 1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
+  â\95°─────result: 1
+  â\95­considering: 1}{yes}{${lookup{xx}lsearch{/non/exist}}}}

   ├──expanding: 1
   ├──expanding: 1

-  â\94\94─────result: 1
+  â\95°─────result: 1

  ├──condition: eq {1}{1}
  ├─────result: true
  ├──condition: eq {1}{1}
  ├─────result: true

-  â\94\8cconsidering: yes}{${lookup{xx}lsearch{/non/exist}}}}
+  â\95­considering: yes}{${lookup{xx}lsearch{/non/exist}}}}

   ├──expanding: yes
   ├──expanding: yes

-  â\94\94─────result: yes
-  â\94\8c───scanning: ${lookup{xx}lsearch{/non/exist}}}}
-   â\94\8c───scanning: xx}lsearch{/non/exist}}}}
+  â\95°─────result: yes
+  â\95­───scanning: ${lookup{xx}lsearch{/non/exist}}}}
+   â\95­───scanning: xx}lsearch{/non/exist}}}}

    ├──expanding: xx
    ├─────result: xx
    ├──expanding: xx
    ├─────result: xx

-   â\94\94───skipping: result is not used
-   â\94\8c───scanning: /non/exist}}}}
+   â\95°───skipping: result is not used
+   â\95­───scanning: /non/exist}}}}

    ├──expanding: /non/exist
    ├─────result: /non/exist
    ├──expanding: /non/exist
    ├─────result: /non/exist

-   â\94\94───skipping: result is not used
+   â\95°───skipping: result is not used

   ├──expanding: ${lookup{xx}lsearch{/non/exist}}
   ├─────result: 
   ├──expanding: ${lookup{xx}lsearch{/non/exist}}
   ├─────result: 

-  â\94\94───skipping: result is not used
+  â\95°───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}}}}

- â\94\94─────result: yes
- â\94\8cconsidering: match_address:   ${if match_address{a.b.c}{a.b.c}{yes}{no}}
-  â\94\8cconsidering: a.b.c}{a.b.c}{yes}{no}}
+ â\95°─────result: yes
+ â\95­considering: match_address:   ${if match_address{a.b.c}{a.b.c}{yes}{no}}
+  â\95­considering: a.b.c}{a.b.c}{yes}{no}}

   ├──expanding: a.b.c
   ├──expanding: a.b.c

-  â\94\94─────result: a.b.c
-  â\94\8cconsidering: a.b.c}{yes}{no}}
+  â\95°─────result: a.b.c
+  â\95­considering: a.b.c}{yes}{no}}

   ├──expanding: a.b.c
   ├──expanding: a.b.c

-  â\94\94─────result: a.b.c
+  â\95°─────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
 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

-  â\94\8c───scanning: yes}{no}}
+  â\95­───scanning: yes}{no}}

   ├──expanding: yes
   ├─────result: yes
   ├──expanding: yes
   ├─────result: yes

-  â\94\94───skipping: result is not used
-  â\94\8cconsidering: no}}
+  â\95°───skipping: result is not used
+  â\95­considering: no}}

   ├──expanding: no
   ├──expanding: no

-  â\94\94─────result: no
- ├──expanding: a.b.c
- â\94\94─────result: match_address:   no
+  â\95°─────result: no
+ ├──expanding: match_address:   ${if match_address{a.b.c}{a.b.c}{yes}{no}}
+ â\95°─────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
 >>>>>>>>>>>>>>>> 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
  |--expanding: primary_hostname: $primary_hostname
  \_____result: primary_hostname: myhost.test.ex
  /considering: primary_hostname: $primary_hostname
  |--expanding: primary_hostname: $primary_hostname
  \_____result: primary_hostname: myhost.test.ex


@@ -161,87 +167,93 @@ LOG: MAIN PANIC
   /considering: no}}
   |--expanding: no
   \_____result: no
   /considering: no}}
   |--expanding: no
   \_____result: no

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

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

- ┌considering: -oMa  sender_host_address = $sender_host_address
+dropping to exim gid; retaining priv uid
+ ╭considering: -oMa  sender_host_address = $sender_host_address

  ├──expanding: -oMa  sender_host_address = $sender_host_address
  ├──expanding: -oMa  sender_host_address = $sender_host_address

- â\94\94─────result: -oMa  sender_host_address = V4NET.0.0.1
- â\94\8cconsidering:       sender_host_port = $sender_host_port
+ â\95°─────result: -oMa  sender_host_address = V4NET.0.0.1
+ â\95­considering:       sender_host_port = $sender_host_port

  ├──expanding:       sender_host_port = $sender_host_port
  ├──expanding:       sender_host_port = $sender_host_port

- â\94\94─────result:       sender_host_port = 1234
- â\94\8cconsidering: -oMaa sender_host_authenticated = $sender_host_authenticated
+ â\95°─────result:       sender_host_port = 1234
+ â\95­considering: -oMaa sender_host_authenticated = $sender_host_authenticated

  ├──expanding: -oMaa sender_host_authenticated = $sender_host_authenticated
  ├──expanding: -oMaa sender_host_authenticated = $sender_host_authenticated

- â\94\94─────result: -oMaa sender_host_authenticated = AAA
- â\94\8cconsidering: -oMai authenticated_id = $authenticated_id
+ â\95°─────result: -oMaa sender_host_authenticated = AAA
+ â\95­considering: -oMai authenticated_id = $authenticated_id

  ├──expanding: -oMai authenticated_id = $authenticated_id
  ├──expanding: -oMai authenticated_id = $authenticated_id

- └─────result: -oMai authenticated_id = philip
- ┌considering: -oMas authenticated_sender = $authenticated_sender
+ ╰─────result: -oMai authenticated_id = philip
+            ╰──(tainted)
+ ╭considering: -oMas authenticated_sender = $authenticated_sender

  ├──expanding: -oMas authenticated_sender = $authenticated_sender
  ├──expanding: -oMas authenticated_sender = $authenticated_sender

- └─────result: -oMas authenticated_sender = xx@yy.zz
- ┌considering: -oMi  interface_address = $interface_address
+ ╰─────result: -oMas authenticated_sender = xx@yy.zz
+            ╰──(tainted)
+ ╭considering: -oMi  interface_address = $interface_address

  ├──expanding: -oMi  interface_address = $interface_address
  ├──expanding: -oMi  interface_address = $interface_address

- â\94\94─────result: -oMi  interface_address = 1.1.1.1
- â\94\8cconsidering:       interface_port = $interface_port
+ â\95°─────result: -oMi  interface_address = 1.1.1.1
+ â\95­considering:       interface_port = $interface_port

  ├──expanding:       interface_port = $interface_port
  ├──expanding:       interface_port = $interface_port

- â\94\94─────result:       interface_port = 99
- â\94\8cconsidering: -oMr  received_protocol = $received_protocol
+ â\95°─────result:       interface_port = 99
+ â\95­considering: -oMr  received_protocol = $received_protocol

  ├──expanding: -oMr  received_protocol = $received_protocol
  ├──expanding: -oMr  received_protocol = $received_protocol

- â\94\94─────result: -oMr  received_protocol = special
- â\94\8cconsidering: -oMt  sender_ident = $sender_ident
+ â\95°─────result: -oMr  received_protocol = special
+ â\95­considering: -oMt  sender_ident = $sender_ident

  ├──expanding: -oMt  sender_ident = $sender_ident
  ├──expanding: -oMt  sender_ident = $sender_ident

- â\94\94─────result: -oMt  sender_ident = me
+ â\95°─────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
 >>>>>>>>>>>>>>>> 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

- ┌considering: -oMa  sender_host_address = $sender_host_address
+dropping to exim gid; retaining priv uid
+ ╭considering: -oMa  sender_host_address = $sender_host_address

  ├──expanding: -oMa  sender_host_address = $sender_host_address
  ├──expanding: -oMa  sender_host_address = $sender_host_address

- â\94\94─────result: -oMa  sender_host_address = V4NET.0.0.1
- â\94\8cconsidering:       sender_host_port = $sender_host_port
+ â\95°─────result: -oMa  sender_host_address = V4NET.0.0.1
+ â\95­considering:       sender_host_port = $sender_host_port

  ├──expanding:       sender_host_port = $sender_host_port
  ├──expanding:       sender_host_port = $sender_host_port

- â\94\94─────result:       sender_host_port = 1234
- â\94\8cconsidering: -oMaa sender_host_authenticated = $sender_host_authenticated
+ â\95°─────result:       sender_host_port = 1234
+ â\95­considering: -oMaa sender_host_authenticated = $sender_host_authenticated

  ├──expanding: -oMaa sender_host_authenticated = $sender_host_authenticated
  ├──expanding: -oMaa sender_host_authenticated = $sender_host_authenticated

- â\94\94─────result: -oMaa sender_host_authenticated = AAA
- â\94\8cconsidering: -oMai authenticated_id = $authenticated_id
+ â\95°─────result: -oMaa sender_host_authenticated = AAA
+ â\95­considering: -oMai authenticated_id = $authenticated_id

  ├──expanding: -oMai authenticated_id = $authenticated_id
  ├──expanding: -oMai authenticated_id = $authenticated_id

- └─────result: -oMai authenticated_id = philip
- ┌considering: -oMas authenticated_sender = $authenticated_sender
+ ╰─────result: -oMai authenticated_id = philip
+            ╰──(tainted)
+ ╭considering: -oMas authenticated_sender = $authenticated_sender

  ├──expanding: -oMas authenticated_sender = $authenticated_sender
  ├──expanding: -oMas authenticated_sender = $authenticated_sender

- └─────result: -oMas authenticated_sender = xx@yy.zz
- ┌considering: -oMi  interface_address = $interface_address
+ ╰─────result: -oMas authenticated_sender = xx@yy.zz
+            ╰──(tainted)
+ ╭considering: -oMi  interface_address = $interface_address

  ├──expanding: -oMi  interface_address = $interface_address
  ├──expanding: -oMi  interface_address = $interface_address

- â\94\94─────result: -oMi  interface_address = 1.1.1.1
- â\94\8cconsidering:       interface_port = $interface_port
+ â\95°─────result: -oMi  interface_address = 1.1.1.1
+ â\95­considering:       interface_port = $interface_port

  ├──expanding:       interface_port = $interface_port
  ├──expanding:       interface_port = $interface_port

- â\94\94─────result:       interface_port = 99
- â\94\8cconsidering: -oMr  received_protocol = $received_protocol
+ â\95°─────result:       interface_port = 99
+ â\95­considering: -oMr  received_protocol = $received_protocol

  ├──expanding: -oMr  received_protocol = $received_protocol
  ├──expanding: -oMr  received_protocol = $received_protocol

- â\94\94─────result: -oMr  received_protocol = special
- â\94\8cconsidering: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}}
-  â\94\8cconsidering: black}{white}{$sender_host_name}{No}}
+ â\95°─────result: -oMr  received_protocol = special
+ â\95­considering: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}}
+  â\95­considering: black}{white}{$sender_host_name}{No}}

   ├──expanding: black
   ├──expanding: black

-  â\94\94─────result: black
-  â\94\8cconsidering: white}{$sender_host_name}{No}}
+  â\95°─────result: black
+  â\95­considering: white}{$sender_host_name}{No}}

   ├──expanding: white
   ├──expanding: white

-  â\94\94─────result: white
+  â\95°─────result: white

  ├──condition: eq{black}{white}
  ├─────result: false
  ├──condition: eq{black}{white}
  ├─────result: false

-  â\94\8c───scanning: $sender_host_name}{No}}
+  â\95­───scanning: $sender_host_name}{No}}

   ├──expanding: $sender_host_name
   ├─────result: 
   ├──expanding: $sender_host_name
   ├─────result: 

-  â\94\94───skipping: result is not used
-  â\94\8cconsidering: No}}
+  â\95°───skipping: result is not used
+  â\95­considering: No}}

   ├──expanding: No
   ├──expanding: No

-  â\94\94─────result: No
+  â\95°─────result: No

  ├──expanding: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}}
  ├──expanding: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}}

- â\94\94─────result: ----> No lookup yet: No
- â\94\8cconsidering: -oMs  sender_host_name = $sender_host_name
+ â\95°─────result: ----> No lookup yet: No
+ â\95­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 


@@ -250,10 +262,11 @@ checking addresses for ten-1.test.ex
 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
 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
+ ╰─────result: -oMs  sender_host_name = ten-1.test.ex
+            ╰──(tainted)
+ ╭considering: -oMt  sender_ident = $sender_ident

  ├──expanding: -oMt  sender_ident = $sender_ident
  ├──expanding: -oMt  sender_ident = $sender_ident

- â\94\94─────result: -oMt  sender_ident = me
+ â\95°─────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
 >>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective


@@ -503,6 +516,7 @@ 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)
 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)