X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=test%2Fstderr%2F0398;h=4756ab0539c6fecc4f74c1eb43d3374f6fc61955;hp=ff0aa766fab222892ffeaa0bb52ce2a4363eba7b;hb=8102279385f5f70c959aa219feca37031c0a1828;hpb=9bfb7e1bec2b3b6022c2e7b42df9ac606693dcfd diff --git a/test/stderr/0398 b/test/stderr/0398 index ff0aa766f..4756ab053 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -5,8 +5,6 @@ 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 -DSN: r2 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 @@ -23,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") @@ -49,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 @@ -72,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") @@ -98,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) @@ -118,19 +116,19 @@ routed by r2 router transport: t2 host 127.0.0.1 [127.0.0.1] Attempting full verification using callout -locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile -EXIM_DBOPEN: file dir flags=O_RDWR -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR -dbfn_read: key=remote + locking TESTSUITE/spool/db/callout.lockfile + locked TESTSUITE/spool/db/callout.lockfile + EXIM_DBOPEN: file dir flags=O_RDWR + 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 -dbfn_read: key=qq@remote + dbfn_read: key=qq@remote callout cache: no address record found for qq@remote -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + 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 @@ -144,29 +142,30 @@ cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: cmd buf flush ddd bytes +sync_responses expect rcpt SMTP<< 550 Unknown SMTP>> QUIT cmd buf flush ddd bytes SMTP<< 250 OK SMTP(close)>> -locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile -EXIM_DBOPEN: file dir flags=O_RDWR|O_CREAT -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT -dbfn_write: key=remote + locking TESTSUITE/spool/db/callout.lockfile + locked TESTSUITE/spool/db/callout.lockfile + EXIM_DBOPEN: file dir flags=O_RDWR|O_CREAT + 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 -dbfn_write: key=qq@remote + dbfn_write: key=qq@remote wrote negative callout cache address record for qq@remote -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile ----------- end verify ------------ 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") @@ -177,7 +176,7 @@ 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") @@ -185,7 +184,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") @@ -211,8 +210,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) @@ -231,24 +230,24 @@ routed by r2 router transport: t2 host 127.0.0.1 [127.0.0.1] Attempting full verification using callout -locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile -EXIM_DBOPEN: file dir flags=O_RDWR -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR -dbfn_read: key=remote + locking TESTSUITE/spool/db/callout.lockfile + locked TESTSUITE/spool/db/callout.lockfile + EXIM_DBOPEN: file dir flags=O_RDWR + 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 -dbfn_read: key=qq@remote + dbfn_read: key=qq@remote callout cache: found address record for qq@remote callout cache: address record is negative -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile ----------- end verify ------------ 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") @@ -262,4 +261,4 @@ 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 >>>>>>>>>>>>>>>>