Merge branch '4.next'

[users/heiko/exim.git] / test / stderr / 0432

diff --git a/test/stderr/0432 b/test/stderr/0432
index 0e6a1d952b5844038bb4c17530fe2faebbbb6f69..67280c3e2da07679f76d3b1073ddbc2a18dd7200 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -72,6 +72,7 @@ domain = y
 routed by r1 router
   envelope to: x@y
   transport: t1
 routed by r1 router
   envelope to: x@y
   transport: t1

+host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)

 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 MUNGED: ::1 will be omitted in what follows
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 MUNGED: ::1 will be omitted in what follows


@@ -84,9 +85,9 @@ Attempting full verification using callout
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  dbfn_read: key=y
  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
+ 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
+ callout cache: no address record found for x@y

  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 interface=NULL port=1224
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 interface=NULL port=1224


@@ -116,10 +117,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=y
  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
+ 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
+ wrote positive callout cache address record for x@y

  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 ----------- end verify ------------
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 ----------- end verify ------------


@@ -182,6 +183,7 @@ domain = y
 routed by r1 router
   envelope to: x@y
   transport: t1
 routed by r1 router
   envelope to: x@y
   transport: t1

+host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)

 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 MUNGED: ::1 will be omitted in what follows
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 MUNGED: ::1 will be omitted in what follows


@@ -194,10 +196,10 @@ Attempting full verification using callout
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  dbfn_read: key=y
  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
+ 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
+ callout cache: found address record for x@y
+ callout cache: address record is positive

  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 ----------- end verify ------------
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 ----------- end verify ------------