X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/d8fe1c03b30ec7dba12669726e41b3b6f5303632..78cc8a23961c969fb7ca66e694446d2e1f7abc98:/test/stderr/2600 diff --git a/test/stderr/2600 b/test/stderr/2600 index 1c0fb042a..cc1864aa2 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 @@ -138,7 +139,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 +154,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 +168,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 +184,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 +205,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 @@ -227,7 +233,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 +247,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 +272,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,6 +289,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 @@ -307,6 +318,10 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) calling local_scan(); timeout=300 local_scan() returned 0 NULL Writing spool header file +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 Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -319,7 +334,7 @@ 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 @@ -331,7 +346,9 @@ 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 @@ -412,9 +429,9 @@ hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx -writing data block fd=8 size=sss timeout=0 -writing data block fd=8 size=sss timeout=0 -writing data block fd=8 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called journalling userx@myhost.test.ex @@ -433,6 +450,14 @@ 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