Docs: Add note regarding DANE vs. the smtp transport multi_domain option. Bug 2265

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

diff --git a/test/stderr/0398 b/test/stderr/0398
index 24b04f402316fcd120718686a70028f5edefea23..ee9c91bed0f221c9593f804283ab17f8d9a9d93b 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -63,7 +63,7 @@ remote host address is the local host: remote: configured to try delivery anyway
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=remote local_part_data=NULL

 routed by r2 router
   envelope to: qq@remote
   transport: t2
 routed by r2 router
   envelope to: qq@remote
   transport: t2


@@ -112,7 +112,7 @@ remote host address is the local host: remote: configured to try delivery anyway
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=remote local_part_data=NULL

 routed by r2 router
   envelope to: qq@remote
   transport: t2
 routed by r2 router
   envelope to: qq@remote
   transport: t2


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

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


@@ -156,10 +156,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=remote
  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
+ 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
+ wrote negative callout cache address record for qq@remote

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


@@ -175,7 +175,6 @@ qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted

-DSN: orcpt: NULL  flags: 0

 SMTP<< rcpt to:<xyz@local>
 using ACL "rcpt"
 processing "deny" (TESTSUITE/test-config 19)
 SMTP<< rcpt to:<xyz@local>
 using ACL "rcpt"
 processing "deny" (TESTSUITE/test-config 19)


@@ -227,7 +226,7 @@ remote host address is the local host: remote: configured to try delivery anyway
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL
 queued for t2 transport: local_part = qq
 domain = remote
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=remote local_part_data=NULL

 routed by r2 router
   envelope to: qq@remote
   transport: t2
 routed by r2 router
   envelope to: qq@remote
   transport: t2


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

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


@@ -258,7 +257,6 @@ qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted

-DSN: orcpt: NULL  flags: 0

 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN