X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/966e829c812abf574896810d3313247348a6532c..5cd1d1356732d96d49a1f7c682d1b8a33b2576f9:/test/stderr/0398?ds=sidebyside diff --git a/test/stderr/0398 b/test/stderr/0398 index 03b126df8..d4f6a1c54 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -21,7 +21,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to: using ACL "rcpt" -processing "deny" +processing "deny" (TESTSUITE/test-config 19) check senders = qq@remote address match test: subject=qq@remote pattern=qq@remote remote in "remote"? yes (matched "remote") @@ -47,8 +47,8 @@ r2 router called for qq@remote domain = remote route_item = * 127.0.0.1 remote in "*"? yes (matched "*") -original list of hosts = "127.0.0.1" options = -expanded list of hosts = "127.0.0.1" options = +original list of hosts = '127.0.0.1' options = '' +expanded list of hosts = '127.0.0.1' options = '' set transport t2 finding IP address for 127.0.0.1 calling host_find_byname @@ -62,7 +62,7 @@ remote host address is the local host: remote: configured to try delivery anyway queued for t2 transport: local_part = qq domain = remote errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=remote local_part_data=NULL routed by r2 router envelope to: qq@remote transport: t2 @@ -70,7 +70,7 @@ routed by r2 router ----------- end verify ------------ sender qq@remote verified ok deny: condition test failed in ACL "rcpt" -processing "warn" +processing "warn" (TESTSUITE/test-config 21) check senders = qq@remote address match test: subject=qq@remote pattern=qq@remote remote in "remote"? yes (matched "remote") @@ -96,8 +96,8 @@ r2 router called for qq@remote domain = remote route_item = * 127.0.0.1 remote in "*"? yes (matched "*") -original list of hosts = "127.0.0.1" options = -expanded list of hosts = "127.0.0.1" options = +original list of hosts = '127.0.0.1' options = '' +expanded list of hosts = '127.0.0.1' options = '' finding IP address for 127.0.0.1 calling host_find_byname using host_fake_gethostbyname for 127.0.0.1 (IPv4) @@ -110,7 +110,7 @@ remote host address is the local host: remote: configured to try delivery anyway queued for t2 transport: local_part = qq domain = remote errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=remote local_part_data=NULL routed by r2 router envelope to: qq@remote transport: t2 @@ -122,13 +122,13 @@ Attempting full verification using callout returned from EXIM_DBOPEN: 0xAAAAAAAA opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR dbfn_read: key=remote -callout cache: found domain record for remote + callout cache: found domain record for remote dbfn_read: key=qq@remote -callout cache: no address record found for qq@remote + callout cache: no address record found for qq@remote EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO mail.test.ex @@ -142,7 +142,7 @@ cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: cmd buf flush ddd bytes -sync_responses expect rcpt +sync_responses expect rcpt for qq@remote SMTP<< 550 Unknown SMTP>> QUIT cmd buf flush ddd bytes @@ -154,10 +154,10 @@ cmd buf flush ddd bytes returned from EXIM_DBOPEN: 0xAAAAAAAA opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT dbfn_write: key=remote -wrote callout cache domain record for remote: - result=1 postmaster=0 random=0 + wrote callout cache domain record for remote: + result=1 postmaster=0 random=0 dbfn_write: key=qq@remote -wrote negative callout cache address record for qq@remote + wrote negative callout cache address record for qq@remote EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile ----------- end verify ------------ @@ -165,7 +165,7 @@ l_message: $acl_verify_message warn: condition test succeeded in ACL "rcpt" LOG: MAIN U=CALLER Warning: Sender verify failed: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:: 550 Unknown -processing "accept" +processing "accept" (TESTSUITE/test-config 24) check senders = qq@remote address match test: subject=qq@remote pattern=qq@remote remote in "remote"? yes (matched "remote") @@ -173,10 +173,9 @@ qq@remote in "qq@remote"? yes (matched "qq@remote") accept: condition test succeeded in ACL "rcpt" end of ACL "rcpt": ACCEPT SMTP>> 250 Accepted -DSN: orcpt: NULL flags: 0 SMTP<< rcpt to: using ACL "rcpt" -processing "deny" +processing "deny" (TESTSUITE/test-config 19) check senders = qq@remote address match test: subject=qq@remote pattern=qq@remote remote in "remote"? yes (matched "remote") @@ -184,7 +183,7 @@ qq@remote in "qq@remote"? yes (matched "qq@remote") check !verify = sender using cached sender verify result deny: condition test failed in ACL "rcpt" -processing "warn" +processing "warn" (TESTSUITE/test-config 21) check senders = qq@remote address match test: subject=qq@remote pattern=qq@remote remote in "remote"? yes (matched "remote") @@ -210,8 +209,8 @@ r2 router called for qq@remote domain = remote route_item = * 127.0.0.1 remote in "*"? yes (matched "*") -original list of hosts = "127.0.0.1" options = -expanded list of hosts = "127.0.0.1" options = +original list of hosts = '127.0.0.1' options = '' +expanded list of hosts = '127.0.0.1' options = '' finding IP address for 127.0.0.1 calling host_find_byname using host_fake_gethostbyname for 127.0.0.1 (IPv4) @@ -224,7 +223,7 @@ remote host address is the local host: remote: configured to try delivery anyway queued for t2 transport: local_part = qq domain = remote errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=remote local_part_data=NULL routed by r2 router envelope to: qq@remote transport: t2 @@ -236,10 +235,10 @@ Attempting full verification using callout returned from EXIM_DBOPEN: 0xAAAAAAAA opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR dbfn_read: key=remote -callout cache: found domain record for remote + callout cache: found domain record for remote dbfn_read: key=qq@remote -callout cache: found address record for qq@remote -callout cache: address record is negative + callout cache: found address record for qq@remote + callout cache: address record is negative EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile ----------- end verify ------------ @@ -247,7 +246,7 @@ l_message: $acl_verify_message warn: condition test succeeded in ACL "rcpt" LOG: MAIN U=CALLER Warning: Sender verify failed -processing "accept" +processing "accept" (TESTSUITE/test-config 24) check senders = qq@remote address match test: subject=qq@remote pattern=qq@remote remote in "remote"? yes (matched "remote") @@ -255,10 +254,9 @@ qq@remote in "qq@remote"? yes (matched "qq@remote") accept: condition test succeeded in ACL "rcpt" end of ACL "rcpt": ACCEPT SMTP>> 250 Accepted -DSN: orcpt: NULL flags: 0 SMTP<< quit SMTP>> 221 mail.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>