X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/a7538db17824b7fd70c12ef7561a67b85d6f247e..ac4824af42edfb6f930056ca3e48d4866975f303:/test/stderr/0386?ds=sidebyside diff --git a/test/stderr/0386 b/test/stderr/0386 index 6084853e4..be777a736 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -8,6 +8,7 @@ trusted user admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp +DSN: r1 propagating DSN seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -28,6 +29,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<1@b> read ACL from file TESTSUITE/aux-fixed/0386.acl1 @@ -75,6 +78,8 @@ LOG: MAIN REJECT SMTP<< rset SMTP>> 250 Reset OK SMTP<< mail from: +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<1@b> using ACL "TESTSUITE/aux-fixed/0386.acl1" @@ -134,6 +139,7 @@ trusted user admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp +DSN: r1 propagating DSN seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -156,6 +162,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<2@b> read ACL from file TESTSUITE/aux-fixed/0386.acl2 @@ -179,15 +187,23 @@ processing "accept" accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT SMTP>> 250 Accepted +DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -host in ignore_fromline_hosts? no (option unset) +PDKIM >> raw hdr: {CR}{LF} +PDKIM >> raw hdr: Message{SP}1{CR}{LF} +PDKIM >> raw hdr: .{CR}{LF} +PDKIM >> raw hdr: rset{CR}{LF} +PDKIM >> raw hdr: mail{SP}from:{CR}{LF} +PDKIM >> raw hdr: rcpt{SP}to:<2@b>{CR}{LF} +PDKIM >> raw hdr: data{CR}{LF} >>Headers received: search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from [V4NET.11.12.13] (ident=CALLER) @@ -201,7 +217,12 @@ P Received: from [V4NET.11.12.13] (ident=CALLER) >> calling local_scan(); timeout=300 local_scan() returned 0 NULL -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 +DSN: **** SPOOL_OUT - address: |2@b| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss @@ -216,10 +237,12 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user +DSN: r1 propagating DSN 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=x@y sender_fullhost = [V4NET.11.12.13] @@ -229,11 +252,13 @@ Non-recipients: Empty Tree ---- End of tree ---- recipients_count=1 +**** SPOOL_IN - No additional fields body_linecount=1 message_linecount=7 +DSN: set orcpt: NULL flags: 0 Delivery address list: 2@b 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 @@ -270,7 +295,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> 2@b <-------- 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 @@ -308,10 +333,18 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: -2@b: no retry items + 2@b: no retry items Failed addresses: Deferred addresses: end of retry processing +DSN: processing router : r1 +DSN: processing successful delivery address: 2@b +DSN: Sender_address: x@y +DSN: orcpt: NULL flags: 0 +DSN: envid: NULL ret: 0 +DSN: Final recipient: 2@b +DSN: Remote SMTP server supports DSN: 0 +DSN: not sending DSN success message LOG: MAIN Completed end delivery of 10HmaX-0005vi-00 @@ -322,6 +355,8 @@ smtp_setup_msg entered SMTP<< rset SMTP>> 250 Reset OK SMTP<< mail from: +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<2@b> using ACL "TESTSUITE/aux-fixed/0386.acl2" @@ -340,15 +375,19 @@ processing "accept" accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT SMTP>> 250 Accepted +DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -host in ignore_fromline_hosts? no (option unset) +PDKIM >> raw hdr: {CR}{LF} +PDKIM >> raw hdr: Message{SP}2{CR}{LF} +PDKIM >> raw hdr: .{CR}{LF} >>Headers received: search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: from [V4NET.11.12.13] (ident=CALLER) @@ -360,9 +399,15 @@ P Received: from [V4NET.11.12.13] (ident=CALLER) X-Warning: V4NET.11.12.13 is listed at rbl.test.ex X-Warning: This is a test blacklisting message >> +PDKIM >> raw hdr: quit{CR}{LF} calling local_scan(); timeout=300 local_scan() returned 0 NULL -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 +DSN: **** SPOOL_OUT - address: |2@b| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss @@ -377,10 +422,12 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user +DSN: r1 propagating DSN 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 10HmaY-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D reading spool file 10HmaY-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y sender_fullhost = [V4NET.11.12.13] @@ -390,11 +437,13 @@ Non-recipients: Empty Tree ---- End of tree ---- recipients_count=1 +**** SPOOL_IN - No additional fields body_linecount=1 message_linecount=7 +DSN: set orcpt: NULL flags: 0 Delivery address list: 2@b 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 @@ -430,7 +479,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> 2@b <-------- 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 @@ -468,10 +517,18 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 Processing retry items Succeeded addresses: -2@b: no retry items + 2@b: no retry items Failed addresses: Deferred addresses: end of retry processing +DSN: processing router : r1 +DSN: processing successful delivery address: 2@b +DSN: Sender_address: x@y +DSN: orcpt: NULL flags: 0 +DSN: envid: NULL ret: 0 +DSN: Final recipient: 2@b +DSN: Remote SMTP server supports DSN: 0 +DSN: not sending DSN success message LOG: MAIN Completed end delivery of 10HmaY-0005vi-00