X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2709ca2632f61d2ebcdf5ef2040b5b7068fd6a96..cf0812d5:/test/stderr/2600?ds=sidebyside diff --git a/test/stderr/2600 b/test/stderr/2600 index bc770e28d..4e9974733 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -111,6 +111,7 @@ configuration file is TESTSUITE/test-config 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": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -131,6 +132,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: using ACL "check_recipient" @@ -138,7 +141,7 @@ processing "accept" check domains = +local_domains d in "@"? no (end of list) d in "+local_domains"? no (end of list) -accept: condition test failed +accept: condition test failed in ACL "check_recipient" processing "accept" check hosts = +relay_hosts search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" @@ -153,9 +156,11 @@ lookup forced cache cleanup lookup failed host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"? no (end of list) host in "+relay_hosts"? no (end of list) -accept: condition test failed +accept: condition test failed in ACL "check_recipient" processing "deny" -deny: condition test succeeded + message: relay not permitted +deny: condition test succeeded in ACL "check_recipient" +end of ACL "check_recipient": DENY SMTP>> 550 relay not permitted LOG: MAIN REJECT H=[10.0.0.0] F= rejected RCPT : relay not permitted @@ -165,7 +170,7 @@ processing "accept" check domains = +local_domains d in "@"? no (end of list) d in "+local_domains"? no (end of list) -accept: condition test failed +accept: condition test failed in ACL "check_recipient" processing "accept" check hosts = +relay_hosts search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" @@ -181,9 +186,11 @@ lookup forced cache cleanup lookup failed host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"? no (end of list) host in "+relay_hosts"? no (end of list) -accept: condition test failed +accept: condition test failed in ACL "check_recipient" processing "deny" -deny: condition test succeeded + message: relay not permitted +deny: condition test succeeded in ACL "check_recipient" +end of ACL "check_recipient": DENY SMTP>> 550 relay not permitted LOG: MAIN REJECT H=[10.0.0.0] F= rejected RCPT : relay not permitted @@ -200,6 +207,7 @@ configuration file is TESTSUITE/test-config 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": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -220,6 +228,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: using ACL "check_recipient" @@ -227,7 +237,7 @@ processing "accept" check domains = +local_domains d in "@"? no (end of list) d in "+local_domains"? no (end of list) -accept: condition test failed +accept: condition test failed in ACL "check_recipient" processing "accept" check hosts = +relay_hosts search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" @@ -241,15 +251,17 @@ file lookup required for select * from them where id='10.10.10.10' lookup yielded: name=ok id=10.10.10.10 host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'") host in "+relay_hosts"? yes (matched "+relay_hosts") -accept: condition test succeeded +accept: condition test succeeded in ACL "check_recipient" +end of ACL "check_recipient": ACCEPT SMTP>> 250 Accepted +DSN: orcpt: NULL flags: 0 SMTP<< rcpt to: using ACL "check_recipient" processing "accept" check domains = +local_domains d in "@"? no (end of list) d in "+local_domains"? no (end of list) -accept: condition test failed +accept: condition test failed in ACL "check_recipient" processing "accept" check hosts = +relay_hosts search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" @@ -264,8 +276,10 @@ cached data used for lookup of select * from them where id='10.10.10.10' lookup yielded: name=ok id=10.10.10.10 host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'") host in "+relay_hosts"? yes (matched "+relay_hosts") -accept: condition test succeeded +accept: condition test succeeded in ACL "check_recipient" +end of ACL "check_recipient": ACCEPT SMTP>> 250 Accepted +DSN: orcpt: NULL flags: 0 SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN @@ -279,11 +293,14 @@ configuration file is TESTSUITE/test-config 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": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex set_process_info: pppp accepting a local non-SMTP message 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 Sender: CALLER@myhost.test.ex Recipients: userx @@ -294,10 +311,11 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 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 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -306,7 +324,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 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: |userx@myhost.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@myhost.test.ex U=CALLER P=local S=sss @@ -319,11 +342,12 @@ changed uid/gid: forcing real = effective configuration file is TESTSUITE/test-config trusted user admin user -skipping ACL configuration - not needed +DSN: r1 propagating DSN seeking password data for user "CALLER": cache not available 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@myhost.test.ex sender_local=1 ident=CALLER @@ -331,11 +355,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: userx@myhost.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 @@ -382,7 +408,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@myhost.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 @@ -429,10 +455,18 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: -userx@myhost.test.ex: no retry items + userx@myhost.test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing +DSN: processing router : r1 +DSN: processing successful delivery address: userx@myhost.test.ex +DSN: Sender_address: CALLER@myhost.test.ex +DSN: orcpt: NULL flags: 0 +DSN: envid: NULL ret: 0 +DSN: Final recipient: userx@myhost.test.ex +DSN: Remote SMTP server supports DSN: 0 +DSN: not sending DSN success message LOG: MAIN Completed end delivery of 10HmaX-0005vi-00