X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d8fe1c03b30ec7dba12669726e41b3b6f5303632..exim-4_83_RC1:/test/stderr/0386?ds=sidebyside diff --git a/test/stderr/0386 b/test/stderr/0386 index 2679f5b74..b796773d8 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -34,12 +34,14 @@ read ACL from file TESTSUITE/aux-fixed/0386.acl1 processing "accept" check hosts = : host in ":"? no (end of list) -accept: condition test failed +accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "deny" check local_parts = ^.*[@%!/|] 1 in "^.*[@%!/|]"? no (end of list) -deny: condition test failed +deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "require" +l_message: Invalid sender + message: Couldn't verify the sender check verify = sender/defer_ok >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Verifying x@y @@ -62,9 +64,10 @@ routed by r1 router transport: t1 ----------- end verify ------------ sender x@y verified ok -require: condition test succeeded +require: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "deny" -deny: condition test succeeded + message: No such user here +deny: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1" SMTP>> 550 No such user here LOG: MAIN REJECT H=[V4NET.9.8.7] F= rejected RCPT <1@b>: No such user here @@ -77,12 +80,14 @@ using ACL "TESTSUITE/aux-fixed/0386.acl1" processing "accept" check hosts = : host in ":"? no (end of list) -accept: condition test failed +accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "deny" check local_parts = ^.*[@%!/|] 1 in "^.*[@%!/|]"? no (end of list) -deny: condition test failed +deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "require" +l_message: Invalid sender + message: Couldn't verify the sender check verify = sender/defer_ok >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Verifying x@y @@ -104,9 +109,10 @@ routed by r1 router transport: t1 ----------- end verify ------------ sender x@y verified ok -require: condition test succeeded +require: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "deny" -deny: condition test succeeded + message: No such user here +deny: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1" SMTP>> 550 No such user here LOG: MAIN REJECT H=[V4NET.9.8.7] F= rejected RCPT <1@b>: No such user here @@ -133,6 +139,7 @@ sender address = NULL sender_fullhost = [V4NET.11.12.13] sender_rcvhost = [V4NET.11.12.13] (ident=CALLER) set_process_info: pppp handling incoming connection from [V4NET.11.12.13] via -oMa +set_process_info: pppp accepting a local SMTP message from host in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER @@ -151,6 +158,8 @@ SMTP>> 250 OK SMTP<< rcpt to:<2@b> read ACL from file TESTSUITE/aux-fixed/0386.acl2 processing "warn" + message: X-Warning: $sender_host_address is listed at $dnslist_domain\nX-Warning: $dnslist_text +l_message: found in $dnslist_domain: $dnslist_text check dnslists = rbl.test.ex DNS list check: rbl.test.ex new DNS lookup for 13.12.11.V4NET.rbl.test.ex @@ -160,12 +169,12 @@ DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2) DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) using fakens DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) succeeded => that means V4NET.11.12.13 is listed at rbl.test.ex -warn: condition test succeeded +warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" LOG: MAIN H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message created log directory TESTSUITE/spool/log processing "accept" -accept: condition test succeeded +accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" SMTP>> 250 Accepted SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself @@ -279,9 +288,9 @@ hitch name: TESTSUITE/test-mail/2.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/2 is locked writing to file TESTSUITE/test-mail/2 -writing data block fd=10 size=sss timeout=0 -writing data block fd=10 size=sss timeout=0 -writing data block fd=10 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 2@b @@ -314,16 +323,18 @@ SMTP>> 250 OK SMTP<< rcpt to:<2@b> using ACL "TESTSUITE/aux-fixed/0386.acl2" processing "warn" + message: X-Warning: $sender_host_address is listed at $dnslist_domain\nX-Warning: $dnslist_text +l_message: found in $dnslist_domain: $dnslist_text check dnslists = rbl.test.ex DNS list check: rbl.test.ex using result of previous DNS lookup DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2) => that means V4NET.11.12.13 is listed at rbl.test.ex -warn: condition test succeeded +warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" LOG: MAIN H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message processing "accept" -accept: condition test succeeded +accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" SMTP>> 250 Accepted SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself @@ -436,9 +447,9 @@ hitch name: TESTSUITE/test-mail/2.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/2 is locked writing to file TESTSUITE/test-mail/2 -writing data block fd=10 size=sss timeout=0 -writing data block fd=10 size=sss timeout=0 -writing data block fd=10 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 2@b