X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9f1a75f126ae217a3a3568b106c9133b3c5c413a..c4eb4f03931be9d798ab085981b2cee6c058d109:/test/stderr/0632?ds=inline diff --git a/test/stderr/0632 b/test/stderr/0632 index eca5a279e..66928e2e8 100644 --- a/test/stderr/0632 +++ b/test/stderr/0632 @@ -1,6 +1,8 @@ ******** SERVER ******** Exim version x.yz .... +environment after trimming: + PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user @@ -9,6 +11,7 @@ daemon_smtp_port overridden by -oX: <: 1225 creating notifier socket ╭considering: $spool_directory/exim_daemon_notify + ├──────value: TESTSUITE/spool ├considering: /exim_daemon_notify ├───────text: /exim_daemon_notify ├──expanding: $spool_directory/exim_daemon_notify @@ -25,12 +28,15 @@ Connection request from 127.0.0.1 port sssss search_tidyup called p1235 Process p1235 is handling incoming connection from [127.0.0.1] p1235 ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full +p1235 ├──────value: myhost.test.ex p1235 ├considering: ESMTP Exim $version_number $tod_full p1235 ├───────text: ESMTP Exim p1235 ├considering: $version_number $tod_full +p1235 ├──────value: x.yz p1235 ├considering: $tod_full p1235 ├───────text: p1235 ├considering: $tod_full +p1235 ├──────value: Tue, 2 Mar 1999 09:44:33 +0000 p1235 ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full p1235 ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 p1235 Process p1235 is ready for new message @@ -38,6 +44,7 @@ p1235 compiled caseless RE '^nomatch_list' not found in local cache p1235 compiled RE '^nomatch_list' saved in local cache p1235 sending RE '^nomatch_list' to daemon p1235 ╭considering: $spool_directory/exim_daemon_notify +p1235 ├──────value: TESTSUITE/spool p1235 ├considering: /exim_daemon_notify p1235 ├───────text: /exim_daemon_notify p1235 ├──expanding: $spool_directory/exim_daemon_notify @@ -58,6 +65,7 @@ p1235 compiling RE 'static_RE' p1235 compiled RE 'static_RE' saved in local cache p1235 sending RE 'static_RE' to daemon p1235 ╭considering: $spool_directory/exim_daemon_notify +p1235 ├──────value: TESTSUITE/spool p1235 ├considering: /exim_daemon_notify p1235 ├───────text: /exim_daemon_notify p1235 ├──expanding: $spool_directory/exim_daemon_notify @@ -84,6 +92,7 @@ p1235 compiling RE 'tricky_static_RE$' p1235 compiled RE 'tricky_static_RE$' saved in local cache p1235 sending RE 'tricky_static_RE$' to daemon p1235 ╭considering: $spool_directory/exim_daemon_notify +p1235 ├──────value: TESTSUITE/spool p1235 ├considering: /exim_daemon_notify p1235 ├───────text: /exim_daemon_notify p1235 ├──expanding: $spool_directory/exim_daemon_notify @@ -148,6 +157,8 @@ p1235 }}(Exim $version_number) p1235 ${if def:sender_address {(envelope-from <$sender_address>) p1235 }}id $message_exim_id${if def:received_for { p1235 for $received_for}} +p1235 ├──────value: [127.0.0.1] (helo=test.ex) +p1235 ╰──(tainted) p1235 ├considering: p1235 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std @@ -195,6 +206,7 @@ p1235 ╎ }}(Exim $version_number) p1235 ╎ ${if def:sender_address {(envelope-from <$sender_address>) p1235 ╎ }}id $message_exim_id${if def:received_for { p1235 ╎ for $received_for}} +p1235 ╎├──────value: p1235 ╎├───scanning: } }}${if def:sender_helo_name {(helo=$sender_helo_name) p1235 ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std p1235 ╎ }}(Exim $version_number) @@ -242,6 +254,7 @@ p1235 }}(Exim $version_number) p1235 ${if def:sender_address {(envelope-from <$sender_address>) p1235 }}id $message_exim_id${if def:received_for { p1235 for $received_for}} +p1235 ├──────value: p1235 ├───scanning: ) p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std p1235 }}(Exim $version_number) @@ -284,6 +297,7 @@ p1235 }}(Exim $version_number) p1235 ${if def:sender_address {(envelope-from <$sender_address>) p1235 }}id $message_exim_id${if def:received_for { p1235 for $received_for}} +p1235 ├──────value: myhost.test.ex p1235 ├considering: ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std p1235 }}(Exim $version_number) p1235 ${if def:sender_address {(envelope-from <$sender_address>) @@ -308,6 +322,7 @@ p1235 }}(Exim $version_number) p1235 ${if def:sender_address {(envelope-from <$sender_address>) p1235 }}id $message_exim_id${if def:received_for { p1235 for $received_for}} +p1235 ├──────value: smtp p1235 ├considering: }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std p1235 }}(Exim $version_number) p1235 ${if def:sender_address {(envelope-from <$sender_address>) @@ -328,6 +343,7 @@ p1235 }}(Exim $version_number) p1235 ${if def:sender_address {(envelope-from <$sender_address>) p1235 }}id $message_exim_id${if def:received_for { p1235 for $received_for}} +p1235 ${if def:sender_address {(envelope-from <$sender_address>) p1235 }}id $message_exim_id${if def:received_for { p1235 for $received_for}} p1235 ├──expanding: ($tls_in_ver) @@ -353,6 +369,7 @@ p1235 }}(Exim $version_number) p1235 ${if def:sender_address {(envelope-from <$sender_address>) p1235 }}id $message_exim_id${if def:received_for { p1235 for $received_for}} +p1235 ├──────value: p1235 ├───scanning: p1235 }}(Exim $version_number) p1235 ${if def:sender_address {(envelope-from <$sender_address>) @@ -380,6 +397,7 @@ p1235 ├considering: $version_number) p1235 ${if def:sender_address {(envelope-from <$sender_address>) p1235 }}id $message_exim_id${if def:received_for { p1235 for $received_for}} +p1235 ├──────value: x.yz p1235 ├considering: ) p1235 ${if def:sender_address {(envelope-from <$sender_address>) p1235 }}id $message_exim_id${if def:received_for { @@ -398,6 +416,8 @@ p1235 ├───────text: (envelope-from < p1235 ├considering: $sender_address>) p1235 }}id $message_exim_id${if def:received_for { p1235 for $received_for}} +p1235 ├──────value: CALLER@test.ex +p1235 ╰──(tainted) p1235 ├considering: >) p1235 }}id $message_exim_id${if def:received_for { p1235 for $received_for}} @@ -418,6 +438,7 @@ p1235 for $received_for}} p1235 ├───────text: id p1235 ├considering: $message_exim_id${if def:received_for { p1235 for $received_for}} +p1235 ├──────value: 10HmaX-000000005vi-0000 p1235 ├considering: ${if def:received_for { p1235 for $received_for}} p1235 ├──condition: def:received_for @@ -427,6 +448,8 @@ p1235 for $received_for}} p1235 ├───────text: p1235 for p1235 ├considering: $received_for}} +p1235 ├──────value: dest_1@test.ex +p1235 ╰──(tainted) p1235 ├considering: }} p1235 ├──expanding: p1235 for $received_for @@ -446,31 +469,31 @@ p1235 for $received_for}} p1235 ╰─────result: Received: from [127.0.0.1] (helo=test.ex) p1235 by myhost.test.ex with smtp (Exim x.yz) p1235 (envelope-from ) -p1235 id 10HmaX-0005vi-00 +p1235 id 10HmaX-000000005vi-0000 p1235 for dest_1@test.ex p1235 ╰──(tainted) p1235 ╭considering: ${tod_full} p1235 ├──expanding: ${tod_full} p1235 ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN - <= CALLER@test.ex H=(test.ex) [127.0.0.1] P=smtp S=sss + <= CALLER@test.ex H=(test.ex) [127.0.0.1] Ci=p1235 P=smtp S=sss search_tidyup called Process p1235 is ready for new message LOG: smtp_connection MAIN - SMTP connection from (test.ex) [127.0.0.1] closed by QUIT + SMTP connection Ci=p1235 from (test.ex) [127.0.0.1] D=qqs closed by QUIT p1234 1 SMTP accept process running p1234 Listening... -p1234 daemon_notification from addr '' +p1234 daemon_notification (from unknown addr) p1234 compiled caseless RE '^nomatch_list' not found in local cache p1234 compiling caseless RE '^nomatch_list' p1234 compiled RE '^nomatch_list' saved in local cache p1234 Listening... -p1234 daemon_notification from addr '' +p1234 daemon_notification (from unknown addr) p1234 compiled RE 'static_RE' not found in local cache p1234 compiling RE 'static_RE' p1234 compiled RE 'static_RE' saved in local cache p1234 Listening... -p1234 daemon_notification from addr '' +p1234 daemon_notification (from unknown addr) p1234 compiled RE 'tricky_static_RE$' not found in local cache p1234 compiling RE 'tricky_static_RE$' p1234 compiled RE 'tricky_static_RE$' saved in local cache @@ -485,12 +508,15 @@ p1234 Connection request from 127.0.0.1 port sssss p1234 search_tidyup called p1236 Process p1236 is handling incoming connection from [127.0.0.1] p1236 ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full +p1236 ├──────value: myhost.test.ex p1236 ├considering: ESMTP Exim $version_number $tod_full p1236 ├───────text: ESMTP Exim p1236 ├considering: $version_number $tod_full +p1236 ├──────value: x.yz p1236 ├considering: $tod_full p1236 ├───────text: p1236 ├considering: $tod_full +p1236 ├──────value: Tue, 2 Mar 1999 09:44:33 +0000 p1236 ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full p1236 ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 p1236 Process p1236 is ready for new message @@ -585,6 +611,8 @@ p1236 }}(Exim $version_number) p1236 ${if def:sender_address {(envelope-from <$sender_address>) p1236 }}id $message_exim_id${if def:received_for { p1236 for $received_for}} +p1236 ├──────value: [127.0.0.1] (helo=test.ex) +p1236 ╰──(tainted) p1236 ├considering: p1236 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std @@ -632,6 +660,7 @@ p1236 ╎ }}(Exim $version_number) p1236 ╎ ${if def:sender_address {(envelope-from <$sender_address>) p1236 ╎ }}id $message_exim_id${if def:received_for { p1236 ╎ for $received_for}} +p1236 ╎├──────value: p1236 ╎├───scanning: } }}${if def:sender_helo_name {(helo=$sender_helo_name) p1236 ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std p1236 ╎ }}(Exim $version_number) @@ -679,6 +708,7 @@ p1236 }}(Exim $version_number) p1236 ${if def:sender_address {(envelope-from <$sender_address>) p1236 }}id $message_exim_id${if def:received_for { p1236 for $received_for}} +p1236 ├──────value: p1236 ├───scanning: ) p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std p1236 }}(Exim $version_number) @@ -721,6 +751,7 @@ p1236 }}(Exim $version_number) p1236 ${if def:sender_address {(envelope-from <$sender_address>) p1236 }}id $message_exim_id${if def:received_for { p1236 for $received_for}} +p1236 ├──────value: myhost.test.ex p1236 ├considering: ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std p1236 }}(Exim $version_number) p1236 ${if def:sender_address {(envelope-from <$sender_address>) @@ -745,6 +776,7 @@ p1236 }}(Exim $version_number) p1236 ${if def:sender_address {(envelope-from <$sender_address>) p1236 }}id $message_exim_id${if def:received_for { p1236 for $received_for}} +p1236 ├──────value: smtp p1236 ├considering: }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std p1236 }}(Exim $version_number) p1236 ${if def:sender_address {(envelope-from <$sender_address>) @@ -765,6 +797,7 @@ p1236 }}(Exim $version_number) p1236 ${if def:sender_address {(envelope-from <$sender_address>) p1236 }}id $message_exim_id${if def:received_for { p1236 for $received_for}} +p1236 ${if def:sender_address {(envelope-from <$sender_address>) p1236 }}id $message_exim_id${if def:received_for { p1236 for $received_for}} p1236 ├──expanding: ($tls_in_ver) @@ -790,6 +823,7 @@ p1236 }}(Exim $version_number) p1236 ${if def:sender_address {(envelope-from <$sender_address>) p1236 }}id $message_exim_id${if def:received_for { p1236 for $received_for}} +p1236 ├──────value: p1236 ├───scanning: p1236 }}(Exim $version_number) p1236 ${if def:sender_address {(envelope-from <$sender_address>) @@ -817,6 +851,7 @@ p1236 ├considering: $version_number) p1236 ${if def:sender_address {(envelope-from <$sender_address>) p1236 }}id $message_exim_id${if def:received_for { p1236 for $received_for}} +p1236 ├──────value: x.yz p1236 ├considering: ) p1236 ${if def:sender_address {(envelope-from <$sender_address>) p1236 }}id $message_exim_id${if def:received_for { @@ -835,6 +870,8 @@ p1236 ├───────text: (envelope-from < p1236 ├considering: $sender_address>) p1236 }}id $message_exim_id${if def:received_for { p1236 for $received_for}} +p1236 ├──────value: CALLER@test.ex +p1236 ╰──(tainted) p1236 ├considering: >) p1236 }}id $message_exim_id${if def:received_for { p1236 for $received_for}} @@ -855,6 +892,7 @@ p1236 for $received_for}} p1236 ├───────text: id p1236 ├considering: $message_exim_id${if def:received_for { p1236 for $received_for}} +p1236 ├──────value: 10HmaY-000000005vi-0000 p1236 ├considering: ${if def:received_for { p1236 for $received_for}} p1236 ├──condition: def:received_for @@ -864,6 +902,8 @@ p1236 for $received_for}} p1236 ├───────text: p1236 for p1236 ├considering: $received_for}} +p1236 ├──────value: dest_2@test.ex +p1236 ╰──(tainted) p1236 ├considering: }} p1236 ├──expanding: p1236 for $received_for @@ -883,18 +923,18 @@ p1236 for $received_for}} p1236 ╰─────result: Received: from [127.0.0.1] (helo=test.ex) p1236 by myhost.test.ex with smtp (Exim x.yz) p1236 (envelope-from ) -p1236 id 10HmaY-0005vi-00 +p1236 id 10HmaY-000000005vi-0000 p1236 for dest_2@test.ex p1236 ╰──(tainted) p1236 ╭considering: ${tod_full} p1236 ├──expanding: ${tod_full} p1236 ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN - <= CALLER@test.ex H=(test.ex) [127.0.0.1] P=smtp S=sss + <= CALLER@test.ex H=(test.ex) [127.0.0.1] Ci=p1236 P=smtp S=sss search_tidyup called Process p1236 is ready for new message LOG: smtp_connection MAIN - SMTP connection from (test.ex) [127.0.0.1] closed by QUIT + SMTP connection Ci=p1236 from (test.ex) [127.0.0.1] D=qqs closed by QUIT p1234 1 SMTP accept process running p1234 Listening... search_tidyup called