X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/7373d852aafa227745f392555f2e1d24ec24d4b2..e1054c675575d47d6289d7e92aa79e09ca05c3e4:/test/stderr/0402 diff --git a/test/stderr/0402 b/test/stderr/0402 index 566e12843..99b05dd21 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -41,110 +41,109 @@ F From: CALLER_NAME Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 -considering: ${tod_full} - expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 -considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost + /considering: ${tod_full} + |__expanding: ${tod_full} + \_____result: Tue, 2 Mar 1999 09:44:33 +0000 + /considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} - condition: def:sender_rcvhost - result: false - scanning: from $sender_rcvhost + |__condition: def:sender_rcvhost + |_____result: false + / scanning: from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} - expanding: from $sender_rcvhost + |__expanding: from $sender_rcvhost - result: from + |_____result: from - skipping: result is not used -considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) + \___skipping: result is not used + /considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} - condition: def:sender_ident - result: true -considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) + |__condition: def:sender_ident + |_____result: true + /considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} -considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) + ./considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} - expanding: $sender_ident - result: CALLER - expanding: from ${quote_local_part:$sender_ident} - result: from CALLER - condition: def:sender_helo_name - result: false - scanning: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) + .|__expanding: $sender_ident + .\_____result: CALLER + |__expanding: from ${quote_local_part:$sender_ident} + \_____result: from CALLER + |__condition: def:sender_helo_name + |_____result: false + / scanning: (helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} - expanding: (helo=$sender_helo_name) + |__expanding: (helo=$sender_helo_name) - result: (helo=) + |_____result: (helo=) - skipping: result is not used - expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + \___skipping: result is not used + |__expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) }} - result: from CALLER - condition: def:received_protocol - result: true -considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + \_____result: from CALLER + |__condition: def:received_protocol + |_____result: true + /considering: with $received_protocol}} (Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} - expanding: with $received_protocol - result: with local - condition: def:tls_cipher - result: false - scanning: ($tls_cipher) + |__expanding: with $received_protocol + \_____result: with local + |__condition: def:tls_cipher + |_____result: false + / scanning: ($tls_cipher) }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} - expanding: ($tls_cipher) + |__expanding: ($tls_cipher) - result: () + |_____result: () - skipping: result is not used - condition: def:sender_address - result: true -considering: (envelope-from <$sender_address>) + \___skipping: result is not used + |__condition: def:sender_address + |_____result: true + /considering: (envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} - expanding: (envelope-from <$sender_address>) + |__expanding: (envelope-from <$sender_address>) - result: (envelope-from ) + \_____result: (envelope-from ) - condition: def:received_for - result: false - scanning: + |__condition: def:received_for + |_____result: false + / scanning: for $received_for}} - expanding: + |__expanding: for $received_for - result: + |_____result: for - skipping: result is not used - expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost + \___skipping: result is not used + |__expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} - result: Received: from CALLER by mail.test.ex with local (Exim x.yz) + \_____result: Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 >>Generated Received: header line @@ -153,9 +152,9 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -considering: ${tod_full} - expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 + /considering: ${tod_full} + |__expanding: ${tod_full} + \_____result: Tue, 2 Mar 1999 09:44:33 +0000 Writing spool header file: TESTSUITE/spool//input//hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 @@ -284,9 +283,9 @@ local_part=rd+usery domain=test.ex stripped prefix rd+ checking local_parts usery in "usery"? yes (matched "usery") -considering: /non-exist/$domain - expanding: /non-exist/$domain - result: /non-exist/test.ex + /considering: /non-exist/$domain + |__expanding: /non-exist/$domain + \_____result: /non-exist/test.ex calling r5 router rda_interpret (string): TESTSUITE/test-mail/junk expanded: TESTSUITE/test-mail/junk @@ -323,9 +322,9 @@ local_part=rd+CALLER domain=test.ex stripped prefix rd+ checking local_parts CALLER in "CALLER"? yes (matched "CALLER") -considering: /non-exist/$local_part - expanding: /non-exist/$local_part - result: /non-exist/CALLER + /considering: /non-exist/$local_part + |__expanding: /non-exist/$local_part + \_____result: /non-exist/CALLER calling r4 router rda_interpret (string): TESTSUITE/test-mail/junk expanded: TESTSUITE/test-mail/junk @@ -356,9 +355,9 @@ r2 router skipped: local_parts mismatch local_part=userz domain=test.ex checking local_parts userz in "userz"? yes (matched "userz") -considering: /non-exist/$domain - expanding: /non-exist/$domain - result: /non-exist/test.ex + /considering: /non-exist/$domain + |__expanding: /non-exist/$domain + \_____result: /non-exist/test.ex calling r3 router r3 router called for userz@test.ex domain = test.ex @@ -381,9 +380,9 @@ r1 router skipped: local_parts mismatch local_part=usery domain=test.ex checking local_parts usery in "usery"? yes (matched "usery") -considering: /non-exist/$domain - expanding: /non-exist/$domain - result: /non-exist/test.ex + /considering: /non-exist/$domain + |__expanding: /non-exist/$domain + \_____result: /non-exist/test.ex calling r2 router r2 router called for usery@test.ex domain = test.ex @@ -401,9 +400,9 @@ routing CALLER@test.ex local_part=CALLER domain=test.ex checking local_parts CALLER in "CALLER"? yes (matched "CALLER") -considering: /non-exist/$local_part - expanding: /non-exist/$local_part - result: /non-exist/CALLER + /considering: /non-exist/$local_part + |__expanding: /non-exist/$local_part + \_____result: /non-exist/CALLER calling r1 router r1 router called for CALLER@test.ex domain = test.ex @@ -447,18 +446,18 @@ locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available -considering: /non-exist/$local_part - expanding: /non-exist/$local_part - result: /non-exist/usery + /considering: /non-exist/$local_part + |__expanding: /non-exist/$local_part + \_____result: /non-exist/usery search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail/junk transport=ft1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=/non-exist/usery current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using ft1 appendfile transport entered -considering: $address_file - expanding: $address_file - result: TESTSUITE/test-mail/junk + /considering: $address_file + |__expanding: $address_file + \_____result: TESTSUITE/test-mail/junk appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/junk format=unix message_prefix=From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n @@ -470,22 +469,22 @@ hitch name: TESTSUITE/test-mail/junk.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/junk is locked writing to file TESTSUITE/test-mail/junk -considering: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox} + /considering: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox} - condition: def:return_path - result: true -considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox} + |__condition: def:return_path + |_____result: true + /considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox} - expanding: $return_path - result: CALLER@test.ex - scanning: MAILER-DAEMON}} ${tod_bsdinbox} + |__expanding: $return_path + \_____result: CALLER@test.ex + / scanning: MAILER-DAEMON}} ${tod_bsdinbox} - expanding: MAILER-DAEMON - result: MAILER-DAEMON - skipping: result is not used - expanding: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox} + |__expanding: MAILER-DAEMON + |_____result: MAILER-DAEMON + \___skipping: result is not used + |__expanding: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox} - result: From CALLER@test.ex Tue Mar 02 09:44:33 1999 + \_____result: From CALLER@test.ex Tue Mar 02 09:44:33 1999 writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 @@ -511,9 +510,9 @@ changed uid/gid: local delivery to TESTSUITE/test-mail/junk transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp @@ -613,9 +612,9 @@ locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available -considering: /$local_part - expanding: /$local_part - result: /userz + /considering: /$local_part + |__expanding: /$local_part + \_____result: /userz search_tidyup called changed uid/gid: local delivery to userz transport=t2 uid=CALLER_UID gid=CALLER_GID pid=pppp