X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/18eacc1185bea956bd9c793ab34e582c08941799..5bb1dfe41e40fa45f85305ccbd7d4533a229d3fc:/test/stderr/0398?ds=sidebyside

diff --git a/test/stderr/0398 b/test/stderr/0398
index 604e791b6..745b5bb12 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -1,4 +1,5 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
@@ -42,16 +43,16 @@ routing qq@remote
 --------> r1 router <--------
 local_part=qq domain=remote
 checking domains
-remote in "local"?
+remote in domains?
  list element: local
-remote in "local"? no (end of list)
+remote in domains? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=qq domain=remote
 checking domains
-remote in "remote"?
+remote in domains?
  list element: remote
- remote in "remote"? yes (matched "remote")
+ remote in domains? yes (matched "remote")
 calling r2 router
 r2 router called for qq@remote
   domain = remote
@@ -101,16 +102,16 @@ routing qq@remote
 --------> r1 router <--------
 local_part=qq domain=remote
 checking domains
-remote in "local"?
+remote in domains?
  list element: local
-remote in "local"? no (end of list)
+remote in domains? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=qq domain=remote
 checking domains
-remote in "remote"?
+remote in domains?
  list element: remote
- remote in "remote"? yes (matched "remote")
+ remote in domains? yes (matched "remote")
 calling r2 router
 r2 router called for qq@remote
   domain = remote
@@ -138,21 +139,22 @@ 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 <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  dbfn_read: key=remote
+ dbfn_read: size 40 return
  callout cache: found domain record for remote
  dbfn_read: key=qq@remote
+ dbfn_read: null return
  callout cache: no address record found for qq@remote
  EXIM_DBCLOSE(0xAAAAAAAA)
- closed hints database and lockfile
+ closed hints database
 interface=NULL port=PORT_S
-Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen?
- list element: 
- connected
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+ 127.0.0.1 in hosts_try_fastopen?
+  list element: 
+connected
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO mail.test.ex
@@ -173,18 +175,16 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP(close)>>
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
- locking TESTSUITE/spool/db/callout.lockfile
- locked  TESTSUITE/spool/db/callout.lockfile
- EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR|O_CREAT
+ EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
  returned from EXIM_DBOPEN: 0xAAAAAAAA
- opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT
- dbfn_write: key=remote
+ opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
+ dbfn_write: key=remote datalen 40
  wrote callout cache domain record for remote:
    result=1 postmaster=0 random=0
- dbfn_write: key=qq@remote
+ dbfn_write: key=qq@remote datalen 16
  wrote negative callout cache address record for qq@remote
  EXIM_DBCLOSE(0xAAAAAAAA)
- closed hints database and lockfile
+ closed hints database
 ----------- end verify ------------
 l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"
@@ -235,16 +235,16 @@ routing qq@remote
 --------> r1 router <--------
 local_part=qq domain=remote
 checking domains
-remote in "local"?
+remote in domains?
  list element: local
-remote in "local"? no (end of list)
+remote in domains? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=qq domain=remote
 checking domains
-remote in "remote"?
+remote in domains?
  list element: remote
- remote in "remote"? yes (matched "remote")
+ remote in domains? yes (matched "remote")
 calling r2 router
 r2 router called for qq@remote
   domain = remote
@@ -272,18 +272,18 @@ 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 <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  dbfn_read: key=remote
+ dbfn_read: size 40 return
  callout cache: found domain record for remote
  dbfn_read: key=qq@remote
+ dbfn_read: size 16 return
  callout cache: found address record for qq@remote
  callout cache: address record is negative
  EXIM_DBCLOSE(0xAAAAAAAA)
- closed hints database and lockfile
+ closed hints database
 ----------- end verify ------------
 l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"