X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/e47376befc6e4a415319e3c29fad9b0ba2bbd8ee..7b4c8c1fb37f58921e29b6c0753e621c5c854626:/test/stderr/0402 diff --git a/test/stderr/0402 b/test/stderr/0402 index bf70c587f..ed2835589 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -37,6 +37,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 considering: ${tod_full} expanding: ${tod_full} @@ -48,8 +49,8 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost ${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 + 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}} ${if def:tls_cipher {($tls_cipher) @@ -68,8 +69,8 @@ considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${i ${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 + 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}} ${if def:tls_cipher {($tls_cipher) }}(Exim $version_number) @@ -86,8 +87,8 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name result: CALLER expanding: from ${quote_local_part:$sender_ident} result: from CALLER -condition: def:sender_helo_name - result: false + condition: def:sender_helo_name + result: false scanning: (helo=$sender_helo_name) }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) }}(Exim $version_number) @@ -102,8 +103,8 @@ condition: def:sender_helo_name 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 + condition: def:received_protocol + result: true considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher) }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) @@ -111,8 +112,20 @@ considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher) for $received_for}} expanding: with $received_protocol result: with local -condition: def:sender_address - result: true + 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) + + result: () + + 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}} @@ -120,8 +133,8 @@ considering: (envelope-from <$sender_address>) result: (envelope-from ) -condition: def:received_for - result: false + condition: def:received_for + result: false scanning: for $received_for}} expanding: @@ -148,7 +161,7 @@ local_scan() returned 0 NULL considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file +Writing spool header file: TESTSUITE/spool//input//hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -161,6 +174,7 @@ DSN: Flags :0 DSN: **** SPOOL_OUT - address: |rd+CALLER@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |rd+usery@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -186,6 +200,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -211,7 +226,7 @@ Delivery address list: rd+CALLER@test.ex rd+usery@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -406,7 +421,7 @@ routed by r1 router envelope to: CALLER@test.ex transport: t1 locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -433,7 +448,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> TESTSUITE/test-mail/junk <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -462,8 +477,8 @@ 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} -condition: def:return_path - result: true + condition: def:return_path + result: true considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox} expanding: $return_path @@ -491,7 +506,7 @@ LOG: MAIN => TESTSUITE/test-mail/junk R=r5 T=ft1 --------> TESTSUITE/test-mail/junk <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -517,8 +532,8 @@ 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} -condition: def:return_path - result: true + condition: def:return_path + result: true considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox} expanding: $return_path @@ -546,7 +561,7 @@ LOG: MAIN => TESTSUITE/test-mail/junk R=r4 T=ft1 --------> CALLER@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -571,7 +586,7 @@ LOG: MAIN => CALLER R=r1 T=t1 --------> usery@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -599,7 +614,7 @@ LOG: MAIN => usery R=r2 T=t1 --------> userz@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -631,15 +646,15 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: -userz@test.ex: no retry items -usery@test.ex: no retry items -CALLER@test.ex: no retry items -TESTSUITE/test-mail/junk: no retry items -rd+CALLER@test.ex: no retry items -TESTSUITE/test-mail/junk: no retry items -rd+usery@test.ex: no retry items -rd+CALLER@test.ex: no retry items -rd+usery@test.ex: no retry items + userz@test.ex: no retry items + usery@test.ex: no retry items + CALLER@test.ex: no retry items + TESTSUITE/test-mail/junk: no retry items + rd+CALLER@test.ex: no retry items + TESTSUITE/test-mail/junk: no retry items + rd+usery@test.ex: no retry items + rd+CALLER@test.ex: no retry items + rd+usery@test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing