X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/30079bc1d20c0473d012ef33654358cfadb0a2ff..0d9fa8c0a3e0e3dd140880861a60c3def18f176b:/test/stderr/0432?ds=sidebyside diff --git a/test/stderr/0432 b/test/stderr/0432 index 533fc0d3b..95a24a9eb 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -14,7 +14,6 @@ >>> calling r1 router >>> routed by r1 router >>> local host found for non-MX address ->>> fully qualified name = 127.0.0.1 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 @@ -31,6 +30,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 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [1.2.3.4] @@ -73,7 +73,6 @@ routed by r1 router transport: t1 using host_fake_gethostbyname for 127.0.0.1 (IPv4) local host found for non-MX address -fully qualified name = 127.0.0.1 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 @@ -84,11 +83,11 @@ EXIM_DBOPEN(TESTSUITE/spool/db/callout) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR dbfn_read: key=y -callout cache: no domain record found +callout cache: no domain record found for y dbfn_read: key=x@y -callout cache: no address record found -interface=127.0.0.1 port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected +callout cache: no address record found for x@y +interface=NULL port=1224 +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,10 +104,10 @@ EXIM_DBOPEN(TESTSUITE/spool/db/callout) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT dbfn_write: key=y -wrote callout cache domain record: +wrote callout cache domain record for y: result=1 postmaster=0 random=0 dbfn_write: key=x@y -wrote positive callout cache address record +wrote positive callout cache address record for x@y ----------- end verify ------------ sender x@y verified ok accept: condition test succeeded in ACL "mail" @@ -127,6 +126,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 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [1.2.3.4] @@ -169,7 +169,6 @@ routed by r1 router transport: t1 using host_fake_gethostbyname for 127.0.0.1 (IPv4) local host found for non-MX address -fully qualified name = 127.0.0.1 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 @@ -180,9 +179,9 @@ EXIM_DBOPEN(TESTSUITE/spool/db/callout) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR dbfn_read: key=y -callout cache: found domain record +callout cache: found domain record for y dbfn_read: key=x@y -callout cache: found address record +callout cache: found address record for x@y callout cache: address record is positive ----------- end verify ------------ sender x@y verified ok @@ -211,13 +210,12 @@ search_tidyup called >>> calling r1 router >>> routed by r1 router >>> local host found for non-MX address ->>> fully qualified name = 127.0.0.1 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 ->>> callout cache: found domain record ->>> callout cache: found address record +>>> callout cache: found domain record for y +>>> callout cache: found address record for x@y >>> callout cache: address record is positive >>> ----------- end verify ------------ >>> accept: condition test succeeded in ACL "mail" @@ -238,15 +236,14 @@ MUNGED: ::1 will be omitted in what follows >>> calling r1 router >>> routed by r1 router >>> local host found for non-MX address ->>> fully qualified name = 127.0.0.1 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 ->>> callout cache: no domain record found ->>> callout cache: no address record found ->>> interface=127.0.0.1 port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected +>>> 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 >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex @@ -257,9 +254,9 @@ MUNGED: ::1 will be omitted in what follows >>> SMTP>> RCPT TO: >>> SMTP<< 250 OK >>> SMTP>> QUIT ->>> wrote callout cache domain record: +>>> wrote callout cache domain record for b: >>> result=1 postmaster=0 random=0 ->>> wrote positive callout cache address record +>>> wrote positive callout cache address record for a@b >>> ----------- end verify ------------ >>> accept: condition test succeeded in ACL "mail" >>> end of ACL "mail": ACCEPT @@ -279,15 +276,14 @@ MUNGED: ::1 will be omitted in what follows >>> calling r1 router >>> routed by r1 router >>> local host found for non-MX address ->>> fully qualified name = 127.0.0.1 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 ->>> callout cache: no domain record found ->>> callout cache: no address record found ->>> interface=127.0.0.1 port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from 127.0.0.1 ... connected +>>> 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 >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex