X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/81f358daccc6f759456eb1ae0f8e456a9118ca9f..fef179d8e2bbb251f8b90aedb29179c6a53529b2:/test/stderr/0432?ds=sidebyside diff --git a/test/stderr/0432 b/test/stderr/0432 index 79117e25a..fc54dfb48 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -7,7 +7,7 @@ >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "mail" ->>> processing "accept" +>>> processing "accept" (TESTSUITE/test-config 20) >>> check verify = sender/callout=1s,maxwait=1s >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@y @@ -30,7 +30,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 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [1.2.3.4] @@ -52,7 +51,7 @@ 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 using ACL "mail" -processing "accept" +processing "accept" (TESTSUITE/test-config 20) check verify = sender/callout=1s,maxwait=1s >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Verifying x@y @@ -79,19 +78,19 @@ MUNGED: ::1 will be omitted in what follows get[host|ipnode]byname[2] looked up these IP addresses: name=127.0.0.1 address=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 0x2 -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR -dbfn_read: key=y + 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=y callout cache: no domain record found for y -dbfn_read: key=x@y + dbfn_read: key=x@y callout cache: no address record found for x@y -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 myhost.test.ex @@ -105,23 +104,24 @@ cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: cmd buf flush ddd bytes +sync_responses expect rcpt SMTP<< 250 OK SMTP>> QUIT cmd buf flush ddd bytes SMTP<< 220 OK SMTP(close)>> -locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile -EXIM_DBOPEN: file dir flags 0x42 -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT -dbfn_write: key=y + 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=y wrote callout cache domain record for y: result=1 postmaster=0 random=0 -dbfn_write: key=x@y + dbfn_write: key=x@y wrote positive callout cache address record for x@y -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile ----------- end verify ------------ sender x@y verified ok accept: condition test succeeded in ACL "mail" @@ -132,7 +132,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [1.2.3.4] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -140,7 +140,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 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [1.2.3.4] @@ -162,7 +161,7 @@ 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 using ACL "mail" -processing "accept" +processing "accept" (TESTSUITE/test-config 20) check verify = sender/callout=1s,maxwait=1s >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Verifying x@y @@ -189,18 +188,18 @@ MUNGED: ::1 will be omitted in what follows get[host|ipnode]byname[2] looked up these IP addresses: name=127.0.0.1 address=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 0x2 -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR -dbfn_read: key=y + 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=y callout cache: found domain record for y -dbfn_read: key=x@y + dbfn_read: key=x@y callout cache: found address record for x@y callout cache: address record is positive -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile ----------- end verify ------------ sender x@y verified ok accept: condition test succeeded in ACL "mail" @@ -211,7 +210,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [1.2.3.4] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -221,7 +220,7 @@ search_tidyup called >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "mail" ->>> processing "accept" +>>> processing "accept" (TESTSUITE/test-config 20) >>> check verify = sender/callout=1s,maxwait=1s >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@y @@ -247,7 +246,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "mail" ->>> processing "accept" +>>> processing "accept" (TESTSUITE/test-config 20) >>> check verify = sender/callout=1s,maxwait=1s >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing a@b @@ -261,7 +260,7 @@ MUNGED: ::1 will be omitted in what follows >>> callout cache: no domain record found for b >>> callout cache: no address record found for a@b >>> 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 myhost.test.ex @@ -293,7 +292,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "mail" ->>> processing "accept" +>>> processing "accept" (TESTSUITE/test-config 20) >>> check verify = sender/callout=1s,maxwait=1s >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing p1@q @@ -307,7 +306,7 @@ MUNGED: ::1 will be omitted in what follows >>> callout cache: no domain record found for q >>> callout cache: no address record found for p1@q >>> 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 myhost.test.ex