DANE: Fix 2 messages from queue case

[exim.git] / test / stderr / 2202

diff --git a/test/stderr/2202 b/test/stderr/2202
index 9543fb1b184ee95a9763d21ab9f4162e8b69c343..3752ec538179c9417ca2a23240a3e0dbe75261c3 100644 (file)
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -32,10 +32,10 @@ processing "accept" (TESTSUITE/test-config 23)
 check hosts = +ignore_unknown : *.$sender_address_domain : $sender_address_domain : ${lookup dnsdb{>:defer_never,mxh=$sender_address_domain}}
  search_open: dnsdb "NULL"
  search_find: file="NULL"
 check hosts = +ignore_unknown : *.$sender_address_domain : $sender_address_domain : ${lookup dnsdb{>:defer_never,mxh=$sender_address_domain}}
  search_open: dnsdb "NULL"
  search_find: file="NULL"

-   key=">:defer_never,mxh=cioce.test.again.dns" partial=-1 affix=NULL starflags=0
+   key=">:defer_never,mxh=cioce.test.again.dns" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=dnsdb key=">:defer_never,mxh=cioce.test.again.dns"
+   type=dnsdb key=">:defer_never,mxh=cioce.test.again.dns" opts=NULL

  database lookup required for >:defer_never,mxh=cioce.test.again.dns
  dnsdb key: cioce.test.again.dns
 DNS lookup of cioce.test.again.dns (MX) using fakens
  database lookup required for >:defer_never,mxh=cioce.test.again.dns
  dnsdb key: cioce.test.again.dns
 DNS lookup of cioce.test.again.dns (MX) using fakens


@@ -43,7 +43,7 @@ DNS lookup of cioce.test.again.dns (MX) gave TRY_AGAIN
 cioce.test.again.dns in dns_again_means_nonexist? yes (matched "*")
 cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH
 DNS: no SOA record found for neg-TTL
 cioce.test.again.dns in dns_again_means_nonexist? yes (matched "*")
 cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH
 DNS: no SOA record found for neg-TTL

- writing neg-cache entry for cioce.test.again.dns-MX-41, ttl -1
+ writing neg-cache entry for cioce.test.again.dns-MX-xxxx, ttl -1

  lookup failed
 sender host name required, to match against *.cioce.test.again.dns
 looking up host name for ip4.ip4.ip4.ip4
  lookup failed
 sender host name required, to match against *.cioce.test.again.dns
 looking up host name for ip4.ip4.ip4.ip4


@@ -65,8 +65,8 @@ DNS lookup of cioce.test.again.dns (A) gave TRY_AGAIN
 cioce.test.again.dns in dns_again_means_nonexist? yes (matched "*")
 cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH
 DNS: no SOA record found for neg-TTL
 cioce.test.again.dns in dns_again_means_nonexist? yes (matched "*")
 cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH
 DNS: no SOA record found for neg-TTL

- writing neg-cache entry for cioce.test.again.dns-A-c1, ttl -1
-get[host|ipnode]byname[2] returned 1 (HOST_NOT_FOUND)
+ writing neg-cache entry for cioce.test.again.dns-A-xxxx, ttl -1
+host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)

 no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4])
 LOG: host_lookup_failed MAIN
   no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4])
 no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4])
 LOG: host_lookup_failed MAIN
   no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4])


@@ -82,4 +82,4 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>