X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bff2d6435aecaf2701ba12c4dd99c7f395953f19..e7def1adca0cdad42fa08667f883e0bb68ffa6a5:/test/stderr/0002
diff --git a/test/stderr/0002 b/test/stderr/0002
index 41bf8840b..0c34e84c3 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -5,6 +5,10 @@ dropping to exim gid; retaining priv uid
âconsidering: primary_hostname: $primary_hostname
âââexpanding: primary_hostname: $primary_hostname
â°âââââ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
@@ -79,9 +83,9 @@ LOG: MAIN PANIC
â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 pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -163,9 +167,9 @@ LOG: MAIN PANIC
/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 pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -173,31 +177,38 @@ 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
+ â°ââ(tainted)
â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
+ â°ââ(tainted)
âconsidering: -oMai authenticated_id = $authenticated_id
âââexpanding: -oMai authenticated_id = $authenticated_id
â°âââââresult: -oMai authenticated_id = philip
+ â°ââ(tainted)
âconsidering: -oMas authenticated_sender = $authenticated_sender
âââexpanding: -oMas authenticated_sender = $authenticated_sender
â°âââââresult: -oMas authenticated_sender = xx@yy.zz
+ â°ââ(tainted)
âconsidering: -oMi interface_address = $interface_address
âââexpanding: -oMi interface_address = $interface_address
â°âââââresult: -oMi interface_address = 1.1.1.1
+ â°ââ(tainted)
â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
+ â°ââ(tainted)
â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 >>>>>>>>>>>>>>>>
+ â°ââ(tainted)
+>>>>>>>>>>>>>>>> Exim pid=pppp (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
@@ -206,27 +217,33 @@ 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
+ â°ââ(tainted)
â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
+ â°ââ(tainted)
âconsidering: -oMai authenticated_id = $authenticated_id
âââexpanding: -oMai authenticated_id = $authenticated_id
â°âââââresult: -oMai authenticated_id = philip
+ â°ââ(tainted)
âconsidering: -oMas authenticated_sender = $authenticated_sender
âââexpanding: -oMas authenticated_sender = $authenticated_sender
â°âââââresult: -oMas authenticated_sender = xx@yy.zz
+ â°ââ(tainted)
âconsidering: -oMi interface_address = $interface_address
âââexpanding: -oMi interface_address = $interface_address
â°âââââresult: -oMi interface_address = 1.1.1.1
+ â°ââ(tainted)
â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
+ â°ââ(tainted)
âconsidering: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}}
âconsidering: black}{white}{$sender_host_name}{No}}
âââexpanding: black
@@ -255,10 +272,12 @@ 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
+ â°ââ(tainted)
â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 >>>>>>>>>>>>>>>>
+ â°ââ(tainted)
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -299,14 +318,15 @@ sender_fullhost = ten-1.test.ex [V4NET.0.0.1]
sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1])
search_open: lsearch "TESTSUITE/aux-fixed/0002.lsearch"
search_find: file="TESTSUITE/aux-fixed/0002.lsearch"
- key="ten-1.test.ex" partial=2 affix=*. starflags=0
+ key="ten-1.test.ex" partial=2 affix=*. starflags=0 opts=NULL
LRU list:
0TESTSUITE/aux-fixed/0002.lsearch
End
internal_search_find: file="TESTSUITE/aux-fixed/0002.lsearch"
- type=lsearch key="ten-1.test.ex"
+ type=lsearch key="ten-1.test.ex" opts=NULL
file lookup required for ten-1.test.ex
in TESTSUITE/aux-fixed/0002.lsearch
+creating new cache entry
lookup yielded:
host in "<
partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch
@@ -317,7 +337,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
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -345,14 +365,15 @@ 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"
- key="V4NET.0.0.2" partial=-1 affix=NULL starflags=0
+ key="V4NET.0.0.2" partial=-1 affix=NULL starflags=0 opts=NULL
LRU list:
0TESTSUITE/aux-fixed/0002.lsearch
End
internal_search_find: file="TESTSUITE/aux-fixed/0002.lsearch"
- type=lsearch key="V4NET.0.0.2"
+ type=lsearch key="V4NET.0.0.2" opts=NULL
file lookup required for V4NET.0.0.2
in TESTSUITE/aux-fixed/0002.lsearch
+creating new cache entry
lookup failed
host in "net-lsearch;TESTSUITE/aux-fixed/0002.lsearch"? no (end of list)
deny: condition test failed in ACL "connect2"
@@ -361,7 +382,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 (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (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)
@@ -374,6 +395,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
@@ -387,7 +409,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
@@ -402,7 +424,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=
+LOG: 10HmaY-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
@@ -417,7 +439,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=
+LOG: 10HmaZ-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
@@ -432,7 +454,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
@@ -447,7 +469,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=
+LOG: 10HmbB-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)
@@ -460,6 +482,7 @@ LOG: 10HmbB-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
@@ -474,7 +497,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)
@@ -487,6 +510,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
@@ -501,7 +525,7 @@ 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
@@ -513,4 +537,4 @@ 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 (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>