Testsuite: fix munging for ipv6 dns

diff --git a/src/src/host.c b/src/src/host.c
index 26b3c2c68fe08f161d7c8a2c37d37f92b80e372a..1b416997c5548b0e9de375c446a486108371c80a 100644 (file)
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -2204,7 +2204,7 @@ set_address_from_dns(host_item *host, host_item **lastptr,
   const uschar **fully_qualified_name,
   BOOL dnssec_request, BOOL dnssec_require, int whichrrs)
 {
-host_item *thishostlast = NULL;    /* Indicates not yet filled in anything */
+host_item * thishostlast = NULL;    /* Indicates not yet filled in anything */
 BOOL v6_find_again = FALSE;
 BOOL dnssec_fail = FALSE;
 int i;
@@ -2223,12 +2223,12 @@ those sites that feel they have to flaunt the RFC rules. */
 
 if (allow_ip && string_is_ip_address(host->name, NULL) != 0)
   {
-  #ifndef STAND_ALONE
+#ifndef STAND_ALONE
   if (  ignore_target_hosts
      && verify_check_this_host(&ignore_target_hosts, NULL, host->name,
         host->name, NULL) == OK)
     return HOST_IGNORED;
-  #endif
+#endif
 
   host->address = host->name;
   return HOST_FOUND;
@@ -2242,7 +2242,7 @@ testing, we force an IPv4 lookup if the domain matches dns_ipv4_lookup global.
 On an IPv4 system, go round the loop once only, looking only for A records. */
 
 #if HAVE_IPV6
-  #ifndef STAND_ALONE
+# ifndef STAND_ALONE
     if (  disable_ipv6
        || !(whichrrs & HOST_FIND_BY_AAAA)
        ||    dns_ipv4_lookup
@@ -2251,7 +2251,7 @@ On an IPv4 system, go round the loop once only, looking only for A records. */
        )
       i = 0;    /* look up A records only */
     else
-  #endif        /* STAND_ALONE */
+# endif        /* STAND_ALONE */
 
   i = 1;        /* look up AAAA and A records */
 
@@ -2628,7 +2628,8 @@ if (rc != DNS_SUCCEED  &&  whichrrs & HOST_FIND_BY_MX)
   if (dnssec_request)
     if (dns_is_secure(dnsa))
       {
-      DEBUG(D_host_lookup) debug_printf_indent("%s (MX resp) DNSSEC\n", host->name);
+      DEBUG(D_host_lookup)
+       debug_printf_indent("%s (MX resp) DNSSEC\n", host->name);
       dnssec = DS_YES; lookup_dnssec_authenticated = US"yes";
       }
     else

diff --git a/src/src/match.c b/src/src/match.c
index 6acbd9f6108ace57e3c505eeec097f25911b8769..956ce60ad01af635b38b3670ca13436d8c71225e 100644 (file)
--- a/src/src/match.c
+++ b/src/src/match.c
@@ -427,13 +427,12 @@ unsigned int * original_cache_bits = *cache_ptr;
 BOOL include_unknown = FALSE, ignore_unknown = FALSE,
       include_defer = FALSE, ignore_defer = FALSE;
 const uschar * list;
-uschar * sss;
-uschar * ot = NULL;
+uschar * ot = NULL, * sss;
 BOOL textonly_re;
 
 /* Save time by not scanning for the option name when we don't need it. */
 
-HDEBUG(D_any)  /* always give the query.  Give results only for D_lists */
+HDEBUG(D_any)
   {
   const uschar * listname = readconf_find_option(listptr);
   if (*listname) ot = string_sprintf("%s in %s?", name, listname);

diff --git a/src/src/routers/dnslookup.c b/src/src/routers/dnslookup.c
index 80b12cba20eeb2f6311a54c0e69515e4137e0c67..d3c4349b6b76a0b002303656ec56428c325865cb 100644 (file)
--- a/src/src/routers/dnslookup.c
+++ b/src/src/routers/dnslookup.c
@@ -286,10 +286,15 @@ for (;;)
     if (ob->search_parents) flags |= HOST_FIND_SEARCH_PARENTS;
     }
 
-  rc = host_find_bydns(&h, CUS rblock->ignore_target_hosts, flags,
-    srv_service, ob->srv_fail_domains, ob->mx_fail_domains,
-    &rblock->dnssec,
-    &fully_qualified_name, &removed);
+  DEBUG(D_route) debug_printf_indent("main lookup for domain\n");
+   {
+    expand_level++;
+    rc = host_find_bydns(&h, CUS rblock->ignore_target_hosts, flags,
+      srv_service, ob->srv_fail_domains, ob->mx_fail_domains,
+      &rblock->dnssec,
+      &fully_qualified_name, &removed);
+    expand_level--;
+   }
 
   if (removed) setflag(addr, af_local_host_removed);
 
@@ -362,7 +367,7 @@ for (;;)
   As a common cause of this problem is MX records with IP addresses on the
   RHS, give a special message in this case. */
 
-  if (h.mx >= 0 && h.address == NULL)
+  if (h.mx >= 0 && !h.address)
     {
     setflag(addr, af_pass_message);   /* This is not a security risk */
     if (h.name[0] == 0)

diff --git a/test/runtest b/test/runtest
index a163a7145f289e0fe42aa0b20b9d5e6693cf5a20..bc5a50cbcedef4a9b9c56de7bb5bdb6115a2bfa5 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1290,10 +1290,19 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /using host_fake_gethostbyname for \S+ \(IPv6\)/;
     next if /get\[host\|ipnode\]byname\[2\]\(af=inet6\)/;
     next if /DNS lookup of \S+ \(AAAA\) using fakens/;
-    next if / in dns_ipv4_lookup?/;
     next if / writing neg-cache entry for .*AAAA/;
-    next if /^faking res_search\(AAAA\) response length as 65535/;
+    next if /^ *faking res_search\(AAAA\) response length as 65535/;
 
+    if (/ in dns_ipv4_lookup\?$/)
+      {
+      $_= <IN>;
+      if (/ list element: \*$/)
+       {
+       $_= <IN>;
+       next if / in dns_ipv4_lookup\? yes \(matched "\*"\)/;
+       }
+      goto RESET_AFTER_EXTRA_LINE_READ;
+      }
     if (/DNS lookup of \S+ \(AAAA\) gave NO_DATA/)
       {
       $_= <IN>;     # Gets "returning DNS_NODATA"
@@ -1375,7 +1384,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     s/unexpected disconnection while reading SMTP command from \[127.0.0.1\] \K\(error: Connection reset by peer\) //;
 
     # Platform-dependent resolver option bits
-    s/^ (?:writing|update) neg-cache entry for [^,]+-\K[0-9a-f]+, ttl/xxxx, ttl/;
+    s/^ *(?:writing|update) neg-cache entry for [^,]+-\K[0-9a-f]+, ttl/xxxx, ttl/;
 
     # timing variance, run-to-run
     s/^time on queue = \K1s/0s/;

diff --git a/test/stderr/0002 b/test/stderr/0002
index ff30f0528ebb319a27c7f89a55383770cf2cffbb..69640dad2da40bd57b68fa23fba76b78f76d7d46 100644 (file)
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -553,7 +553,6 @@ IP address lookup yielded "ten-1.test.ex"
    ten-1.test.ex not in empty list (option unset? cannot trace name)
   check dnssec request list
    ten-1.test.ex not in empty list (option unset? cannot trace name)
-  faking res_search(AAAA) response length as 65535
   DNS lookup of ten-1.test.ex (A) using fakens
   DNS lookup of ten-1.test.ex (A) succeeded
   ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 

diff --git a/test/stderr/0078 b/test/stderr/0078
index 4e3fcd902f8f0e6ae4383912b434797d7164adf2..75d9d96973606ea32977e4db17b9bd0f53967b3f 100644 (file)
--- a/test/stderr/0078
+++ b/test/stderr/0078
@@ -12,6 +12,7 @@ mxt6.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for xx@mxt6.test.ex
   domain = mxt6.test.ex
+main lookup for domain
 set transport remote_smtp
 queued for remote_smtp transport: local_part = xx
 domain = mxt6.test.ex
@@ -36,6 +37,7 @@ mxt1.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for myhost.test.ex@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
 lookuphost router passed for myhost.test.ex@mxt1.test.ex
 --------> self router <--------
@@ -75,6 +77,7 @@ mxt1.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
 lookuphost router passed for xx@mxt1.test.ex
 --------> self router <--------
@@ -129,6 +132,7 @@ not-exist.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for xx@not-exist.test.ex
   domain = not-exist.test.ex
+main lookup for domain
 lookuphost router declined for xx@not-exist.test.ex
 "more" is false: skipping remaining routers
 no more routers

diff --git a/test/stderr/0094 b/test/stderr/0094
index 0efe2f9ca200a0db2b89be208d31a6d8d600ac52..6310708237fce4f55cc2c222290a73dc87e679cc 100644 (file)
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -129,7 +129,6 @@ IP address lookup yielded "oneback.test.ex"
   oneback.test.ex not in empty list (option unset? cannot trace name)
  check dnssec request list
   oneback.test.ex not in empty list (option unset? cannot trace name)
- faking res_search(AAAA) response length as 65535
  DNS lookup of oneback.test.ex (A) using fakens
  DNS lookup of oneback.test.ex (A) succeeded
  oneback.test.ex V4NET.99.99.90 mx=-1 sort=xx 
@@ -140,7 +139,6 @@ Forward DNS security status: unverified
   host1.masq.test.ex not in empty list (option unset? cannot trace name)
  check dnssec request list
   host1.masq.test.ex not in empty list (option unset? cannot trace name)
- faking res_search(AAAA) response length as 65535
  DNS lookup of host1.masq.test.ex (A) using fakens
  DNS lookup of host1.masq.test.ex (A) succeeded
  host1.masq.test.ex V4NET.90.90.90 mx=-1 sort=xx 

diff --git a/test/stderr/0117 b/test/stderr/0117
index b5cde0daf4c99c8b50fde77bb05dc34ce736cdcc..090ad7be092211f8bb65b838f575f95fb3f0254d 100644 (file)
--- a/test/stderr/0117
+++ b/test/stderr/0117
@@ -8,6 +8,7 @@ local_part=xxx domain=mxt9.test.ex
 calling lookuphost router
 lookuphost router called for xxx@mxt9.test.ex
   domain = mxt9.test.ex
+main lookup for domain
 queued for <unset> transport: local_part = xxx
 domain = mxt9.test.ex
   errors_to=NULL
@@ -29,6 +30,7 @@ local_part=xxx domain=mxt9a.test.ex
 calling lookuphost router
 lookuphost router called for xxx@mxt9a.test.ex
   domain = mxt9a.test.ex
+main lookup for domain
 queued for <unset> transport: local_part = xxx
 domain = mxt9a.test.ex
   errors_to=NULL
@@ -50,6 +52,7 @@ local_part=xxx domain=mxt9b.test.ex
 calling lookuphost router
 lookuphost router called for xxx@mxt9b.test.ex
   domain = mxt9b.test.ex
+main lookup for domain
 queued for <unset> transport: local_part = xxx
 domain = mxt9b.test.ex
   errors_to=NULL

diff --git a/test/stderr/0145 b/test/stderr/0145
index 423a148f33a13ecfc50655e9e31d8e7cea537ca3..176539a66e1db3545fc077afff75f3571b57a0f8 100644 (file)
--- a/test/stderr/0145
+++ b/test/stderr/0145
@@ -16,12 +16,12 @@
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@mxt10.test.ex
 >>> calling domainlist router
->>> check dnssec require list
->>>  mxt10.test.ex in dnssec_require_domains? no (option unset)
->>> check dnssec request list
->>>  mxt10.test.ex in dnssec_request_domains?
->>>   list element: *
->>>   mxt10.test.ex in dnssec_request_domains? yes (matched "*")
+>>>  check dnssec require list
+>>>   mxt10.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   mxt10.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    mxt10.test.ex in dnssec_request_domains? yes (matched "*")
 >>> domainlist router declined for x@mxt10.test.ex
 >>> "more" is false: skipping remaining routers
 >>> no more routers
@@ -48,12 +48,12 @@ LOG: H=(test) [V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender veri
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1.test.ex
 >>> calling domainlist router
->>> check dnssec require list
->>>  ten-1.test.ex in dnssec_require_domains? no (option unset)
->>> check dnssec request list
->>>  ten-1.test.ex in dnssec_request_domains?
->>>   list element: *
->>>   ten-1.test.ex in dnssec_request_domains? yes (matched "*")
+>>>  check dnssec require list
+>>>   ten-1.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   ten-1.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    ten-1.test.ex in dnssec_request_domains? yes (matched "*")
 >>> routed by domainlist router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
@@ -62,12 +62,12 @@ LOG: H=(test) [V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender veri
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@mxt10.test.ex
 >>> calling domainlist router
->>> check dnssec require list
->>>  mxt10.test.ex in dnssec_require_domains? no (option unset)
->>> check dnssec request list
->>>  mxt10.test.ex in dnssec_request_domains?
->>>   list element: *
->>>   mxt10.test.ex in dnssec_request_domains? yes (matched "*")
+>>>  check dnssec require list
+>>>   mxt10.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   mxt10.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    mxt10.test.ex in dnssec_request_domains? yes (matched "*")
 >>> domainlist router declined for x@mxt10.test.ex
 >>> "more" is false: skipping remaining routers
 >>> no more routers

diff --git a/test/stderr/0161 b/test/stderr/0161
index 4515b7946cb1087792159fbed0ab2bd2964ac90e..fe30eb05e4b8d51255814d30feb3b471d7a4649a 100644 (file)
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -19,6 +19,7 @@ mxt6.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for xx@mxt6.test.ex
   domain = mxt6.test.ex
+main lookup for domain
 set transport remote_smtp
 queued for remote_smtp transport: local_part = xx
 domain = mxt6.test.ex
@@ -50,6 +51,7 @@ mxt1.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for myhost.test.ex@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
 lookuphost router passed for myhost.test.ex@mxt1.test.ex
 --------> fail router <--------
@@ -103,6 +105,7 @@ mxt1.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
 lookuphost router passed for xx@mxt1.test.ex
 --------> fail router <--------
@@ -171,6 +174,7 @@ not-exist.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for xx@not-exist.test.ex
   domain = not-exist.test.ex
+main lookup for domain
 lookuphost router declined for xx@not-exist.test.ex
 "more" is false: skipping remaining routers
 no more routers
@@ -190,6 +194,7 @@ checking local_parts
 calling failuphost router
 failuphost router called for ff@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: address failed (self = fail)
 failuphost router forced address failure
 >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
@@ -214,6 +219,7 @@ mxt1.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for fff@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
 lookuphost router passed for fff@mxt1.test.ex
 --------> fail router <--------

diff --git a/test/stderr/0175 b/test/stderr/0175
index 81da79fe8d3dd359c25cbb41df3251e7b51b8155..afaf051372ee5ee5257b88f02288c679cc47c8ff 100644 (file)
--- a/test/stderr/0175
+++ b/test/stderr/0175
@@ -136,12 +136,12 @@ LOG: H=(test) [V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>:
 >>>  cached lookup data = NULL
 >>> ten-1.test.ex in domains? yes (end of list)
 >>> calling lookuphost router
->>> check dnssec require list
->>>  ten-1.test.ex in dnssec_require_domains? no (option unset)
->>> check dnssec request list
->>>  ten-1.test.ex in dnssec_request_domains?
->>>   list element: *
->>>   ten-1.test.ex in dnssec_request_domains? yes (matched "*")
+>>>  check dnssec require list
+>>>   ten-1.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   ten-1.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    ten-1.test.ex in dnssec_request_domains? yes (matched "*")
 >>> routed by lookuphost router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"

diff --git a/test/stderr/0183 b/test/stderr/0183
index 827fde15b8048d2f91c6bc776d3ac467c9e0fb1e..944aa53ae55b4301cc56c4448246773ad217ab31 100644 (file)
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -39,18 +39,19 @@ userx in local_parts? yes (end of list)
 calling lookuphost router
 lookuphost router called for userx@test.again.dns
   domain = test.again.dns
-check dnssec require list
- test.again.dns in dnssec_require_domains? no (option unset)
-check dnssec request list
- test.again.dns in dnssec_request_domains?
-  list element: *
-  test.again.dns in dnssec_request_domains? yes (matched "*")
-DNS lookup of test.again.dns (MX) using fakens
-DNS lookup of test.again.dns (MX) gave TRY_AGAIN
-test.again.dns in dns_again_means_nonexist? no (option unset)
-returning DNS_AGAIN
- writing neg-cache entry for test.again.dns-MX-xxxx, ttl -1
-test.again.dns not in empty list (option unset? cannot trace name)
+main lookup for domain
+ check dnssec require list
+  test.again.dns in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  test.again.dns in dnssec_request_domains?
+   list element: *
+   test.again.dns in dnssec_request_domains? yes (matched "*")
+ DNS lookup of test.again.dns (MX) using fakens
+ DNS lookup of test.again.dns (MX) gave TRY_AGAIN
+ test.again.dns in dns_again_means_nonexist? no (option unset)
+ returning DNS_AGAIN
+  writing neg-cache entry for test.again.dns-MX-xxxx, ttl -1
+ test.again.dns not in empty list (option unset? cannot trace name)
 lookuphost router: defer for userx@test.again.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -84,14 +85,15 @@ abcd in local_parts? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@test.again.dns
   domain = test.again.dns
-check dnssec require list
- test.again.dns in dnssec_require_domains? no (option unset)
-check dnssec request list
- test.again.dns in dnssec_request_domains?
-  list element: *
-  test.again.dns in dnssec_request_domains? yes (matched "*")
-DNS lookup of test.again.dns (MX): using cached value DNS_AGAIN
-test.again.dns not in empty list (option unset? cannot trace name)
+main lookup for domain
+ check dnssec require list
+  test.again.dns in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  test.again.dns in dnssec_request_domains?
+   list element: *
+   test.again.dns in dnssec_request_domains? yes (matched "*")
+ DNS lookup of test.again.dns (MX): using cached value DNS_AGAIN
+ test.again.dns not in empty list (option unset? cannot trace name)
 lookuphost router: defer for abcd@test.again.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -125,23 +127,23 @@ abcd in local_parts? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@ten-1.test.ex
   domain = ten-1.test.ex
-check dnssec require list
- ten-1.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- ten-1.test.ex in dnssec_request_domains?
-  list element: *
-  ten-1.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of ten-1.test.ex (MX) using fakens
-DNS lookup of ten-1.test.ex (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
-ten-1.test.ex (MX resp) DNSSEC
- list element: *
-DNS lookup of ten-1.test.ex (A) using fakens
-DNS lookup of ten-1.test.ex (A) succeeded
-fully qualified name = ten-1.test.ex
-ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
+main lookup for domain
+ check dnssec require list
+  ten-1.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  ten-1.test.ex in dnssec_request_domains?
+   list element: *
+   ten-1.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of ten-1.test.ex (MX) using fakens
+ DNS lookup of ten-1.test.ex (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
+ ten-1.test.ex (MX resp) DNSSEC
+ DNS lookup of ten-1.test.ex (A) using fakens
+ DNS lookup of ten-1.test.ex (A) succeeded
+ fully qualified name = ten-1.test.ex
+ ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
 set transport smtp
 queued for smtp transport: local_part = abcd
 domain = ten-1.test.ex
@@ -189,7 +191,6 @@ check dnssec request list
  test.again.dns in dnssec_request_domains?
   list element: *
   test.again.dns in dnssec_request_domains? yes (matched "*")
- list element: *
 DNS lookup of test.again.dns (A) using fakens
 DNS lookup of test.again.dns (A) gave TRY_AGAIN
 test.again.dns in dns_again_means_nonexist? no (option unset)
@@ -235,7 +236,6 @@ check dnssec request list
  test.again.dns in dnssec_request_domains?
   list element: *
   test.again.dns in dnssec_request_domains? yes (matched "*")
- list element: *
 DNS lookup of test.again.dns (A): using cached value DNS_AGAIN
 useryz router: defer for userz@test.again.dns
   message: host lookup for test.again.dns did not complete (DNS timeout?)
@@ -270,18 +270,18 @@ xyz in local_parts? yes (end of list)
 calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
-check dnssec require list
- ten-1.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- ten-1.test.ex in dnssec_request_domains?
-  list element: *
-  ten-1.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA
- list element: *
-DNS lookup of ten-1.test.ex (A) using fakens
-DNS lookup of ten-1.test.ex (A) succeeded
-fully qualified name = ten-1.test.ex
-ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
+main lookup for domain
+ check dnssec require list
+  ten-1.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  ten-1.test.ex in dnssec_request_domains?
+   list element: *
+   ten-1.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA
+ DNS lookup of ten-1.test.ex (A) using fakens
+ DNS lookup of ten-1.test.ex (A) succeeded
+ fully qualified name = ten-1.test.ex
+ ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
 queued for smtp transport: local_part = xyz
 domain = ten-1.test.ex
   errors_to=NULL
@@ -333,17 +333,18 @@ userx in local_parts? yes (end of list)
 calling lookuphost router
 lookuphost router called for userx@test.fail.dns
   domain = test.fail.dns
-check dnssec require list
- test.fail.dns in dnssec_require_domains? no (option unset)
-check dnssec request list
- test.fail.dns in dnssec_request_domains?
-  list element: *
-  test.fail.dns in dnssec_request_domains? yes (matched "*")
-DNS lookup of test.fail.dns (MX) using fakens
-DNS lookup of test.fail.dns (MX) gave NO_RECOVERY
-returning DNS_FAIL
- writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1
-test.fail.dns not in empty list (option unset? cannot trace name)
+main lookup for domain
+ check dnssec require list
+  test.fail.dns in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  test.fail.dns in dnssec_request_domains?
+   list element: *
+   test.fail.dns in dnssec_request_domains? yes (matched "*")
+ DNS lookup of test.fail.dns (MX) using fakens
+ DNS lookup of test.fail.dns (MX) gave NO_RECOVERY
+ returning DNS_FAIL
+  writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1
+ test.fail.dns not in empty list (option unset? cannot trace name)
 lookuphost router: defer for userx@test.fail.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -377,14 +378,15 @@ abcd in local_parts? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@test.fail.dns
   domain = test.fail.dns
-check dnssec require list
- test.fail.dns in dnssec_require_domains? no (option unset)
-check dnssec request list
- test.fail.dns in dnssec_request_domains?
-  list element: *
-  test.fail.dns in dnssec_request_domains? yes (matched "*")
-DNS lookup of test.fail.dns (MX): using cached value DNS_FAIL
-test.fail.dns not in empty list (option unset? cannot trace name)
+main lookup for domain
+ check dnssec require list
+  test.fail.dns in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  test.fail.dns in dnssec_request_domains?
+   list element: *
+   test.fail.dns in dnssec_request_domains? yes (matched "*")
+ DNS lookup of test.fail.dns (MX): using cached value DNS_FAIL
+ test.fail.dns not in empty list (option unset? cannot trace name)
 lookuphost router: defer for abcd@test.fail.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -418,23 +420,23 @@ abcd in local_parts? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@ten-1.test.ex
   domain = ten-1.test.ex
-check dnssec require list
- ten-1.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- ten-1.test.ex in dnssec_request_domains?
-  list element: *
-  ten-1.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of ten-1.test.ex (MX) using fakens
-DNS lookup of ten-1.test.ex (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
-ten-1.test.ex (MX resp) DNSSEC
- list element: *
-DNS lookup of ten-1.test.ex (A) using fakens
-DNS lookup of ten-1.test.ex (A) succeeded
-fully qualified name = ten-1.test.ex
-ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
+main lookup for domain
+ check dnssec require list
+  ten-1.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  ten-1.test.ex in dnssec_request_domains?
+   list element: *
+   ten-1.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of ten-1.test.ex (MX) using fakens
+ DNS lookup of ten-1.test.ex (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
+ ten-1.test.ex (MX resp) DNSSEC
+ DNS lookup of ten-1.test.ex (A) using fakens
+ DNS lookup of ten-1.test.ex (A) succeeded
+ fully qualified name = ten-1.test.ex
+ ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
 set transport smtp
 queued for smtp transport: local_part = abcd
 domain = ten-1.test.ex
@@ -482,7 +484,6 @@ check dnssec request list
  test.fail.dns in dnssec_request_domains?
   list element: *
   test.fail.dns in dnssec_request_domains? yes (matched "*")
- list element: *
 DNS lookup of test.fail.dns (A) using fakens
 DNS lookup of test.fail.dns (A) gave NO_RECOVERY
 returning DNS_FAIL
@@ -527,7 +528,6 @@ check dnssec request list
  test.fail.dns in dnssec_request_domains?
   list element: *
   test.fail.dns in dnssec_request_domains? yes (matched "*")
- list element: *
 DNS lookup of test.fail.dns (A): using cached value DNS_FAIL
 useryz router: defer for userz@test.fail.dns
   message: host lookup for test.fail.dns did not complete (DNS timeout?)
@@ -562,18 +562,18 @@ xyz in local_parts? yes (end of list)
 calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
-check dnssec require list
- ten-1.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- ten-1.test.ex in dnssec_request_domains?
-  list element: *
-  ten-1.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA
- list element: *
-DNS lookup of ten-1.test.ex (A) using fakens
-DNS lookup of ten-1.test.ex (A) succeeded
-fully qualified name = ten-1.test.ex
-ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
+main lookup for domain
+ check dnssec require list
+  ten-1.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  ten-1.test.ex in dnssec_request_domains?
+   list element: *
+   ten-1.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA
+ DNS lookup of ten-1.test.ex (A) using fakens
+ DNS lookup of ten-1.test.ex (A) succeeded
+ fully qualified name = ten-1.test.ex
+ ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
 queued for smtp transport: local_part = xyz
 domain = ten-1.test.ex
   errors_to=NULL
@@ -625,17 +625,18 @@ userx in local_parts? yes (end of list)
 calling lookuphost router
 lookuphost router called for userx@nonexist.test.ex
   domain = nonexist.test.ex
-check dnssec require list
- nonexist.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- nonexist.test.ex in dnssec_request_domains?
-  list element: *
-  nonexist.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of nonexist.test.ex (MX) using fakens
-DNS lookup of nonexist.test.ex (MX) gave HOST_NOT_FOUND
-returning DNS_NOMATCH
-faking res_search(MX) response length as 65535
- writing neg-cache entry for nonexist.test.ex-MX-xxxx, ttl 3000
+main lookup for domain
+ check dnssec require list
+  nonexist.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  nonexist.test.ex in dnssec_request_domains?
+   list element: *
+   nonexist.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of nonexist.test.ex (MX) using fakens
+ DNS lookup of nonexist.test.ex (MX) gave HOST_NOT_FOUND
+ returning DNS_NOMATCH
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for nonexist.test.ex-MX-xxxx, ttl 3000
 lookuphost router declined for userx@nonexist.test.ex
 "more" is false: skipping remaining routers
 no more routers
@@ -670,13 +671,14 @@ abcd in local_parts? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@nonexist.test.ex
   domain = nonexist.test.ex
-check dnssec require list
- nonexist.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- nonexist.test.ex in dnssec_request_domains?
-  list element: *
-  nonexist.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of nonexist.test.ex (MX): using cached value DNS_NOMATCH
+main lookup for domain
+ check dnssec require list
+  nonexist.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  nonexist.test.ex in dnssec_request_domains?
+   list element: *
+   nonexist.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of nonexist.test.ex (MX): using cached value DNS_NOMATCH
 lookuphost router declined for abcd@nonexist.test.ex
 "more" is false: skipping remaining routers
 no more routers
@@ -711,23 +713,23 @@ abcd in local_parts? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@ten-1.test.ex
   domain = ten-1.test.ex
-check dnssec require list
- ten-1.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- ten-1.test.ex in dnssec_request_domains?
-  list element: *
-  ten-1.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of ten-1.test.ex (MX) using fakens
-DNS lookup of ten-1.test.ex (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
-ten-1.test.ex (MX resp) DNSSEC
- list element: *
-DNS lookup of ten-1.test.ex (A) using fakens
-DNS lookup of ten-1.test.ex (A) succeeded
-fully qualified name = ten-1.test.ex
-ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
+main lookup for domain
+ check dnssec require list
+  ten-1.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  ten-1.test.ex in dnssec_request_domains?
+   list element: *
+   ten-1.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of ten-1.test.ex (MX) using fakens
+ DNS lookup of ten-1.test.ex (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
+ ten-1.test.ex (MX resp) DNSSEC
+ DNS lookup of ten-1.test.ex (A) using fakens
+ DNS lookup of ten-1.test.ex (A) succeeded
+ fully qualified name = ten-1.test.ex
+ ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
 set transport smtp
 queued for smtp transport: local_part = abcd
 domain = ten-1.test.ex
@@ -775,7 +777,6 @@ check dnssec request list
  nonexist.test.ex in dnssec_request_domains?
   list element: *
   nonexist.test.ex in dnssec_request_domains? yes (matched "*")
- list element: *
 DNS lookup of nonexist.test.ex (A) using fakens
 DNS lookup of nonexist.test.ex (A) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
@@ -821,7 +822,6 @@ check dnssec request list
  nonexist.test.ex in dnssec_request_domains?
   list element: *
   nonexist.test.ex in dnssec_request_domains? yes (matched "*")
- list element: *
 DNS lookup of nonexist.test.ex (A): using cached value DNS_NOMATCH
 useryz router: defer for userz@nonexist.test.ex
   message: lookup of host "nonexist.test.ex" failed in useryz router
@@ -856,18 +856,18 @@ xyz in local_parts? yes (end of list)
 calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
-check dnssec require list
- ten-1.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- ten-1.test.ex in dnssec_request_domains?
-  list element: *
-  ten-1.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA
- list element: *
-DNS lookup of ten-1.test.ex (A) using fakens
-DNS lookup of ten-1.test.ex (A) succeeded
-fully qualified name = ten-1.test.ex
-ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
+main lookup for domain
+ check dnssec require list
+  ten-1.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  ten-1.test.ex in dnssec_request_domains?
+   list element: *
+   ten-1.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA
+ DNS lookup of ten-1.test.ex (A) using fakens
+ DNS lookup of ten-1.test.ex (A) succeeded
+ fully qualified name = ten-1.test.ex
+ ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
 queued for smtp transport: local_part = xyz
 domain = ten-1.test.ex
   errors_to=NULL
@@ -904,20 +904,21 @@ srv in local_parts?
 calling srv router
 srv router called for srv@test.again.dns
   domain = test.again.dns
-check dnssec require list
- test.again.dns in dnssec_require_domains? no (option unset)
-check dnssec request list
- test.again.dns in dnssec_request_domains?
-  list element: *
-  test.again.dns in dnssec_request_domains? yes (matched "*")
-DNS lookup of _smtp._tcp.test.again.dns (SRV) using fakens
-DNS lookup of _smtp._tcp.test.again.dns (SRV) gave TRY_AGAIN
-_smtp._tcp.test.again.dns in dns_again_means_nonexist? no (option unset)
-returning DNS_AGAIN
- writing neg-cache entry for _smtp._tcp.test.again.dns-SRV-xxxx, ttl -1
-test.again.dns in srv_fail_domains?
- list element: test.fail.dns
-test.again.dns in srv_fail_domains? no (end of list)
+main lookup for domain
+ check dnssec require list
+  test.again.dns in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  test.again.dns in dnssec_request_domains?
+   list element: *
+   test.again.dns in dnssec_request_domains? yes (matched "*")
+ DNS lookup of _smtp._tcp.test.again.dns (SRV) using fakens
+ DNS lookup of _smtp._tcp.test.again.dns (SRV) gave TRY_AGAIN
+ _smtp._tcp.test.again.dns in dns_again_means_nonexist? no (option unset)
+ returning DNS_AGAIN
+  writing neg-cache entry for _smtp._tcp.test.again.dns-SRV-xxxx, ttl -1
+ test.again.dns in srv_fail_domains?
+  list element: test.fail.dns
+ test.again.dns in srv_fail_domains? no (end of list)
 srv router: defer for srv@test.again.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -936,33 +937,33 @@ srv in local_parts?
 calling srv router
 srv router called for srv@test.fail.dns
   domain = test.fail.dns
-check dnssec require list
- test.fail.dns in dnssec_require_domains? no (option unset)
-check dnssec request list
- test.fail.dns in dnssec_request_domains?
-  list element: *
-  test.fail.dns in dnssec_request_domains? yes (matched "*")
-DNS lookup of _smtp._tcp.test.fail.dns (SRV) using fakens
-DNS lookup of _smtp._tcp.test.fail.dns (SRV) gave NO_RECOVERY
-returning DNS_FAIL
- writing neg-cache entry for _smtp._tcp.test.fail.dns-SRV-xxxx, ttl -1
-test.fail.dns in srv_fail_domains?
- list element: test.fail.dns
- test.fail.dns in srv_fail_domains? yes (matched "test.fail.dns")
-DNS_FAIL treated as DNS_NODATA (domain in srv_fail_domains)
-DNS lookup of test.fail.dns (MX) using fakens
-DNS lookup of test.fail.dns (MX) gave NO_RECOVERY
-returning DNS_FAIL
- writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1
-test.fail.dns in mx_fail_domains?
- list element: test.fail.dns
- test.fail.dns in mx_fail_domains? yes (matched "test.fail.dns")
-DNS_FAIL treated as DNS_NODATA (domain in mx_fail_domains)
- list element: *
-DNS lookup of test.fail.dns (A) using fakens
-DNS lookup of test.fail.dns (A) gave NO_RECOVERY
-returning DNS_FAIL
- writing neg-cache entry for test.fail.dns-A-xxxx, ttl -1
+main lookup for domain
+ check dnssec require list
+  test.fail.dns in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  test.fail.dns in dnssec_request_domains?
+   list element: *
+   test.fail.dns in dnssec_request_domains? yes (matched "*")
+ DNS lookup of _smtp._tcp.test.fail.dns (SRV) using fakens
+ DNS lookup of _smtp._tcp.test.fail.dns (SRV) gave NO_RECOVERY
+ returning DNS_FAIL
+  writing neg-cache entry for _smtp._tcp.test.fail.dns-SRV-xxxx, ttl -1
+ test.fail.dns in srv_fail_domains?
+  list element: test.fail.dns
+  test.fail.dns in srv_fail_domains? yes (matched "test.fail.dns")
+ DNS_FAIL treated as DNS_NODATA (domain in srv_fail_domains)
+ DNS lookup of test.fail.dns (MX) using fakens
+ DNS lookup of test.fail.dns (MX) gave NO_RECOVERY
+ returning DNS_FAIL
+  writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1
+ test.fail.dns in mx_fail_domains?
+  list element: test.fail.dns
+  test.fail.dns in mx_fail_domains? yes (matched "test.fail.dns")
+ DNS_FAIL treated as DNS_NODATA (domain in mx_fail_domains)
+ DNS lookup of test.fail.dns (A) using fakens
+ DNS lookup of test.fail.dns (A) gave NO_RECOVERY
+ returning DNS_FAIL
+  writing neg-cache entry for test.fail.dns-A-xxxx, ttl -1
 srv router: defer for srv@test.fail.dns
   message: host lookup did not complete
 search_tidyup called
@@ -1008,17 +1009,18 @@ userx in local_parts? yes (end of list)
 calling lookuphost router
 lookuphost router called for userx@nonexist.example.com
   domain = nonexist.example.com
-check dnssec require list
- nonexist.example.com in dnssec_require_domains? no (option unset)
-check dnssec request list
- nonexist.example.com in dnssec_request_domains?
-  list element: *
-  nonexist.example.com in dnssec_request_domains? yes (matched "*")
-DNS lookup of nonexist.example.com (MX) using fakens
-DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
-returning DNS_NOMATCH
-faking res_search(MX) response length as 65535
- writing neg-cache entry for nonexist.example.com-MX-xxxx, ttl 2
+main lookup for domain
+ check dnssec require list
+  nonexist.example.com in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  nonexist.example.com in dnssec_request_domains?
+   list element: *
+   nonexist.example.com in dnssec_request_domains? yes (matched "*")
+ DNS lookup of nonexist.example.com (MX) using fakens
+ DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
+ returning DNS_NOMATCH
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for nonexist.example.com-MX-xxxx, ttl 2
 lookuphost router declined for userx@nonexist.example.com
 "more" is false: skipping remaining routers
 no more routers
@@ -1064,18 +1066,19 @@ checking "condition" "${acl {delay}}"...
 calling delay router
 delay router called for userd@nonexist.example.com
   domain = nonexist.example.com
-check dnssec require list
- nonexist.example.com in dnssec_require_domains? no (option unset)
-check dnssec request list
- nonexist.example.com in dnssec_request_domains?
-  list element: *
-  nonexist.example.com in dnssec_request_domains? yes (matched "*")
-DNS lookup of nonexist.example.com (MX): cached value DNS_NOMATCH past valid time
-DNS lookup of nonexist.example.com (MX) using fakens
-DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
-returning DNS_NOMATCH
-faking res_search(MX) response length as 65535
- update neg-cache entry for nonexist.example.com-MX-xxxx, ttl 2
+main lookup for domain
+ check dnssec require list
+  nonexist.example.com in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  nonexist.example.com in dnssec_request_domains?
+   list element: *
+   nonexist.example.com in dnssec_request_domains? yes (matched "*")
+ DNS lookup of nonexist.example.com (MX): cached value DNS_NOMATCH past valid time
+ DNS lookup of nonexist.example.com (MX) using fakens
+ DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
+ returning DNS_NOMATCH
+ faking res_search(MX) response length as 65535
+  update neg-cache entry for nonexist.example.com-MX-xxxx, ttl 2
 delay router declined for userd@nonexist.example.com
 "more" is false: skipping remaining routers
 no more routers

diff --git a/test/stderr/0277 b/test/stderr/0277
index 3cbd9d3db85487f52860f9206bd31e3dba21e752..cde3dcd1a7c39209dc51d3f881d71b00263900a5 100644 (file)
--- a/test/stderr/0277
+++ b/test/stderr/0277
@@ -26,7 +26,7 @@ looking up host name for V4NET.2.3.4
  returning DNS_NOMATCH
  DNS: couldn't fake dnsa len
  DNS: no SOA record found for neg-TTL
-  writing neg-cache entry for 4.3.2.V4NET.in-addr.arpa-PTR-4100041, ttl -1
+  writing neg-cache entry for 4.3.2.V4NET.in-addr.arpa-PTR-xxxx, ttl -1
 LOG: host_lookup_failed MAIN
   no host name found for IP address V4NET.2.3.4
 sender_fullhost = [V4NET.2.3.4]
@@ -143,7 +143,7 @@ looking up host name for V4NET.10.11.12
  returning DNS_NOMATCH
  DNS: couldn't fake dnsa len
  DNS: no SOA record found for neg-TTL
-  writing neg-cache entry for 12.11.10.V4NET.in-addr.arpa-PTR-4100041, ttl -1
+  writing neg-cache entry for 12.11.10.V4NET.in-addr.arpa-PTR-xxxx, ttl -1
 LOG: host_lookup_failed MAIN
   no host name found for IP address V4NET.10.11.12
 sender_fullhost = [V4NET.10.11.12]
@@ -213,7 +213,7 @@ looking up host name for V4NET.1.1.1
  returning DNS_NOMATCH
  DNS: couldn't fake dnsa len
  DNS: no SOA record found for neg-TTL
-  writing neg-cache entry for 1.1.1.V4NET.in-addr.arpa-PTR-4100041, ttl -1
+  writing neg-cache entry for 1.1.1.V4NET.in-addr.arpa-PTR-xxxx, ttl -1
 LOG: host_lookup_failed MAIN
   no host name found for IP address V4NET.1.1.1
 sender_fullhost = [V4NET.1.1.1]
@@ -283,7 +283,7 @@ looking up host name for V4NET.2.2.2
  returning DNS_NOMATCH
  DNS: couldn't fake dnsa len
  DNS: no SOA record found for neg-TTL
-  writing neg-cache entry for 2.2.2.V4NET.in-addr.arpa-PTR-4100041, ttl -1
+  writing neg-cache entry for 2.2.2.V4NET.in-addr.arpa-PTR-xxxx, ttl -1
 LOG: host_lookup_failed MAIN
   no host name found for IP address V4NET.2.2.2
 sender_fullhost = [V4NET.2.2.2]

diff --git a/test/stderr/0278 b/test/stderr/0278
index 30538f4f4a41676da21a251b7f552e09187cf96f..0f8466a00d18f39c2d591dee161b2fc1ffab9a6f 100644 (file)
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -382,23 +382,24 @@ unknown in local_parts? yes (end of list)
 calling r2 router
 r2 router called for unknown@test.ex
   domain = test.ex
-check dnssec require list
- test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- test.ex in dnssec_request_domains?
-  list element: *
-  test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of test.ex (MX) using fakens
-DNS lookup of test.ex (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for test.ex-MX-xxxx, ttl 3000
-test.ex (MX resp) DNSSEC
-DNS lookup of test.ex (A) using fakens
-DNS lookup of test.ex (A) gave NO_DATA
-returning DNS_NODATA
-faking res_search(A) response length as 65535
- writing neg-cache entry for test.ex-A-xxxx, ttl 3000
+main lookup for domain
+ check dnssec require list
+  test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  test.ex in dnssec_request_domains?
+   list element: *
+   test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of test.ex (MX) using fakens
+ DNS lookup of test.ex (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for test.ex-MX-xxxx, ttl 3000
+ test.ex (MX resp) DNSSEC
+ DNS lookup of test.ex (A) using fakens
+ DNS lookup of test.ex (A) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(A) response length as 65535
+  writing neg-cache entry for test.ex-A-xxxx, ttl 3000
 r2 router declined for unknown@test.ex
 --------> r3 router <--------
 local_part=unknown domain=test.ex

diff --git a/test/stderr/0315 b/test/stderr/0315
index 5f0306937439dc0a6aac84bf262ca8102db429b8..052ccaa66565cf625cb48f6f148966efca0a0f6b 100644 (file)
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -28,6 +28,7 @@ checking domains
 calling r1 router
 r1 router called for y@ten-1.test.ex
   domain = ten-1.test.ex
+main lookup for domain
 set transport t1
 queued for t1 transport: local_part = y
 domain = ten-1.test.ex
@@ -90,6 +91,7 @@ local_part=y domain=ten-2.test.ex
 calling r2 router
 r2 router called for y@ten-2.test.ex
   domain = ten-2.test.ex
+main lookup for domain
 set transport t1
 queued for t1 transport: local_part = y
 domain = ten-2.test.ex
@@ -111,6 +113,7 @@ local_part=x domain=ten-2.test.ex
 calling r2 router
 r2 router called for x@ten-2.test.ex
   domain = ten-2.test.ex
+main lookup for domain
 queued for t1 transport: local_part = x
 domain = ten-2.test.ex
   errors_to=NULL

diff --git a/test/stderr/0342 b/test/stderr/0342
index 195ba35e91a5fd560ee96d2667e309cb90a75396..454d93956d9ad0aed444be0bce0bb49fbdb8f285 100644 (file)
--- a/test/stderr/0342
+++ b/test/stderr/0342
@@ -17,22 +17,22 @@
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1
 >>> calling dnslookup router
->>> check dnssec require list
->>>  ten-1 in dnssec_require_domains? no (option unset)
->>> check dnssec request list
->>>  ten-1 in dnssec_request_domains?
->>>   list element: *
->>>   ten-1 in dnssec_request_domains? yes (matched "*")
+>>>  check dnssec require list
+>>>   ten-1 in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   ten-1 in dnssec_request_domains?
+>>>    list element: *
+>>>    ten-1 in dnssec_request_domains? yes (matched "*")
 >>> re-routed to x@ten-1.test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1.test.ex
 >>> calling dnslookup router
->>> check dnssec require list
->>>  ten-1.test.ex in dnssec_require_domains? no (option unset)
->>> check dnssec request list
->>>  ten-1.test.ex in dnssec_request_domains?
->>>   list element: *
->>>   ten-1.test.ex in dnssec_request_domains? yes (matched "*")
+>>>  check dnssec require list
+>>>   ten-1.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   ten-1.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    ten-1.test.ex in dnssec_request_domains? yes (matched "*")
 >>> routed by dnslookup router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_rcpt"

diff --git a/test/stderr/0360 b/test/stderr/0360
index 6364d92d2864caea635a135a1c22b550a37d513d..c3e9a33b89b155fb6a9ae7ba350f0e12b75bfa76 100644 (file)
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -104,7 +104,9 @@ recurse.test.ex in domains? yes (end of list)
 calling r1 router
 r1 router called for unknown@recurse.test.ex
   domain = recurse.test.ex
+main lookup for domain
 r1 router widened recurse.test.ex to recurse.test.ex.test.ex
+main lookup for domain
 domain changed to recurse.test.ex.test.ex
 rewriting header lines
 re-routed to unknown@recurse.test.ex.test.ex
@@ -126,6 +128,7 @@ recurse.test.ex.test.ex in domains? yes (end of list)
 calling r1 router
 r1 router called for unknown@recurse.test.ex.test.ex
   domain = recurse.test.ex.test.ex
+main lookup for domain
 set transport t1
 queued for t1 transport: local_part = unknown
 domain = recurse.test.ex.test.ex

diff --git a/test/stderr/0361 b/test/stderr/0361
index 1a8f7c19e78f90a68e8c00e0756873e7e55c57c1..40e9d5c8e8bb9e46279761d627a51883afa5df20 100644 (file)
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -100,34 +100,36 @@ recurse.test.ex in domains? yes (end of list)
 calling r1 router
 r1 router called for kilos@recurse.test.ex
   domain = recurse.test.ex
-check dnssec require list
- recurse.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- recurse.test.ex in dnssec_request_domains?
-  list element: *
-  recurse.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of recurse.test.ex (MX) using fakens
-DNS lookup of recurse.test.ex (MX) gave HOST_NOT_FOUND
-returning DNS_NOMATCH
-faking res_search(MX) response length as 65535
- writing neg-cache entry for recurse.test.ex-MX-xxxx, ttl 3000
+main lookup for domain
+ check dnssec require list
+  recurse.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  recurse.test.ex in dnssec_request_domains?
+   list element: *
+   recurse.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of recurse.test.ex (MX) using fakens
+ DNS lookup of recurse.test.ex (MX) gave HOST_NOT_FOUND
+ returning DNS_NOMATCH
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for recurse.test.ex-MX-xxxx, ttl 3000
 r1 router widened recurse.test.ex to recurse.test.ex.test.ex
-check dnssec require list
- recurse.test.ex.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- recurse.test.ex.test.ex in dnssec_request_domains?
-  list element: *
-  recurse.test.ex.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of recurse.test.ex.test.ex (MX) using fakens
-DNS lookup of recurse.test.ex.test.ex (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for recurse.test.ex.test.ex-MX-xxxx, ttl 3000
-recurse.test.ex.test.ex (MX resp) DNSSEC
-DNS lookup of recurse.test.ex.test.ex (A) using fakens
-DNS lookup of recurse.test.ex.test.ex (A) succeeded
-fully qualified name = recurse.test.ex.test.ex
-recurse.test.ex.test.ex V4NET.99.0.2 mx=-1 sort=xx 
+main lookup for domain
+ check dnssec require list
+  recurse.test.ex.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  recurse.test.ex.test.ex in dnssec_request_domains?
+   list element: *
+   recurse.test.ex.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of recurse.test.ex.test.ex (MX) using fakens
+ DNS lookup of recurse.test.ex.test.ex (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for recurse.test.ex.test.ex-MX-xxxx, ttl 3000
+ recurse.test.ex.test.ex (MX resp) DNSSEC
+ DNS lookup of recurse.test.ex.test.ex (A) using fakens
+ DNS lookup of recurse.test.ex.test.ex (A) succeeded
+ fully qualified name = recurse.test.ex.test.ex
+ recurse.test.ex.test.ex V4NET.99.0.2 mx=-1 sort=xx 
 domain changed to recurse.test.ex.test.ex
 rewriting header lines
 rewrite_one_header: type=F:

diff --git a/test/stderr/0364 b/test/stderr/0364
index bfac8acf29c5c8f6444ff00eaa285006bc7ef7db..da45f5edc0bf96eefe5674294399ce1061965e82 100644 (file)
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -74,6 +74,7 @@ otherhost.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for solik@otherhost.test.ex
   domain = otherhost.test.ex
+main lookup for domain
 r2 router declined for solik@otherhost.test.ex
 --------> r3 router <--------
 local_part=solik domain=otherhost.test.ex
@@ -102,6 +103,7 @@ otherhost.sub.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for solik@otherhost.sub.test.ex
   domain = otherhost.sub.test.ex
+main lookup for domain
 r2 router declined for solik@otherhost.sub.test.ex
 --------> r3 router <--------
 local_part=solik domain=otherhost.sub.test.ex
@@ -147,6 +149,7 @@ ten-1.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for xxx@ten-1.test.ex
   domain = ten-1.test.ex
+main lookup for domain
 set transport t1
 queued for t1 transport: local_part = xxx
 domain = ten-1.test.ex
@@ -183,6 +186,7 @@ testsub.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for xxx@testsub.test.ex
   domain = testsub.test.ex
+main lookup for domain
 r2 router declined for xxx@testsub.test.ex
 --------> r3 router <--------
 local_part=xxx domain=testsub.test.ex
@@ -211,6 +215,7 @@ testsub.sub.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for xxx@testsub.sub.test.ex
   domain = testsub.sub.test.ex
+main lookup for domain
 queued for t1 transport: local_part = xxx
 domain = testsub.sub.test.ex
   errors_to=NULL

diff --git a/test/stderr/0368 b/test/stderr/0368
index 3b373e5e5c36fcb9f827e73e0d7fdb3c3f9af67f..585510ef243889273b56ca4be2ab707173555712 100644 (file)
--- a/test/stderr/0368
+++ b/test/stderr/0368
@@ -3,23 +3,23 @@ configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 mxt9.test.ex in domains? no (end of list)
-check dnssec require list
-check dnssec request list
-discarded duplicate host ten-1.test.ex (MX=8)
-fully qualified name = mxt9.test.ex
-host_find_bydns yield = HOST_FOUND (3); returned hosts:
-  ten-1.test.ex V4NET.0.0.1 MX=5 
-  ten-2.test.ex V4NET.0.0.2 MX=6 
-  ten-3.test.ex V4NET.0.0.3 MX=7 
+ check dnssec require list
+ check dnssec request list
+ discarded duplicate host ten-1.test.ex (MX=8)
+ fully qualified name = mxt9.test.ex
+ host_find_bydns yield = HOST_FOUND (3); returned hosts:
+   ten-1.test.ex V4NET.0.0.1 MX=5 
+   ten-2.test.ex V4NET.0.0.2 MX=6 
+   ten-3.test.ex V4NET.0.0.3 MX=7 
 mxt14.test.ex in domains? no (end of list)
-check dnssec require list
-check dnssec request list
+ check dnssec require list
+ check dnssec request list
 duplicate IP address V4NET.0.0.5 (MX=5) removed
 duplicate IP address V4NET.0.0.6 (MX=6) removed
-fully qualified name = mxt14.test.ex
-host_find_bydns yield = HOST_FOUND (3); returned hosts:
-  ten-5-6.test.ex V4NET.0.0.5 MX=4 
-  ten-5-6.test.ex V4NET.0.0.6 MX=4 
+ fully qualified name = mxt14.test.ex
+ host_find_bydns yield = HOST_FOUND (3); returned hosts:
+   ten-5-6.test.ex V4NET.0.0.5 MX=4 
+   ten-5-6.test.ex V4NET.0.0.6 MX=4 
 finding IP address for ten-1.test.ex
 doing DNS lookup
 check dnssec require list

diff --git a/test/stderr/0381 b/test/stderr/0381
index 7a3950c14c453d02b8e09b40a9eac1efcbc9401e..2c240677b4e49d36268560a718b9a67cde13bff9 100644 (file)
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -56,7 +56,6 @@ IP address lookup yielded "x.gov.uk.test.ex"
    x.gov.uk.test.ex not in empty list (option unset? cannot trace name)
   check dnssec request list
    x.gov.uk.test.ex not in empty list (option unset? cannot trace name)
-  faking res_search(AAAA) response length as 65535
   DNS lookup of x.gov.uk.test.ex (A) using fakens
   DNS lookup of x.gov.uk.test.ex (A) succeeded
   x.gov.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 
@@ -67,7 +66,6 @@ Forward DNS security status: unverified
    x.co.uk.test.ex not in empty list (option unset? cannot trace name)
   check dnssec request list
    x.co.uk.test.ex not in empty list (option unset? cannot trace name)
-  faking res_search(AAAA) response length as 65535
   DNS lookup of x.co.uk.test.ex (A) using fakens
   DNS lookup of x.co.uk.test.ex (A) succeeded
   x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 

diff --git a/test/stderr/0419 b/test/stderr/0419
index 98d3a7813339e00548b8c5b110bbeb451da9b578..d21a454733b2fa9b30c83a471dff8678bb37395e 100644 (file)
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -29,43 +29,44 @@ mxt13.test.ex in domains? yes (end of list)
 calling dnslookup router
 dnslookup router called for k@mxt13.test.ex
   domain = mxt13.test.ex
-check dnssec require list
- mxt13.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- mxt13.test.ex in dnssec_request_domains?
-  list element: *
-  mxt13.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of mxt13.test.ex (MX) using fakens
-DNS lookup of mxt13.test.ex (MX) succeeded
-DNS lookup of other1.test.ex (A) using fakens
-DNS lookup of other1.test.ex (A) succeeded
-DNS lookup of other2.test.ex (A) using fakens
-DNS lookup of other2.test.ex (A) succeeded
-other1.test.ex in hosts_treat_as_local?
- list element: +local_domains
-  start sublist local_domains
-   other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"?
-   ╎list element: !mxt13.test.ex
-   ╎list element: !other1.test.ex
-   ╎other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!other1.test.ex")
-  end sublist local_domains
-other1.test.ex in hosts_treat_as_local? no (end of list)
-other2.test.ex in hosts_treat_as_local?
- list element: +local_domains
-  start sublist local_domains
-   other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"?
-   ╎list element: !mxt13.test.ex
-   ╎list element: !other1.test.ex
-   ╎list element: *.test.ex
-   ╎other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? yes (matched "*.test.ex")
-  end sublist local_domains
- other2.test.ex in hosts_treat_as_local? yes (matched "+local_domains")
+main lookup for domain
+ check dnssec require list
+  mxt13.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  mxt13.test.ex in dnssec_request_domains?
+   list element: *
+   mxt13.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of mxt13.test.ex (MX) using fakens
+ DNS lookup of mxt13.test.ex (MX) succeeded
+ DNS lookup of other1.test.ex (A) using fakens
+ DNS lookup of other1.test.ex (A) succeeded
+ DNS lookup of other2.test.ex (A) using fakens
+ DNS lookup of other2.test.ex (A) succeeded
+ other1.test.ex in hosts_treat_as_local?
+  list element: +local_domains
+   start sublist local_domains
+   ╎other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"?
+   ╎ list element: !mxt13.test.ex
+   ╎ list element: !other1.test.ex
+   ╎ other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!other1.test.ex")
+   end sublist local_domains
+ other1.test.ex in hosts_treat_as_local? no (end of list)
+ other2.test.ex in hosts_treat_as_local?
+  list element: +local_domains
+   start sublist local_domains
+   ╎other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"?
+   ╎ list element: !mxt13.test.ex
+   ╎ list element: !other1.test.ex
+   ╎ list element: *.test.ex
+   ╎ other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? yes (matched "*.test.ex")
+   end sublist local_domains
+  other2.test.ex in hosts_treat_as_local? yes (matched "+local_domains")
 local host in host list - removed hosts:
   other2.test.ex V4NET.12.3.2 5
   other2.test.ex V4NET.12.3.1 5
-fully qualified name = mxt13.test.ex
-host_find_bydns yield = HOST_FOUND (3); returned hosts:
-  other1.test.ex V4NET.12.4.5 MX=4 
+ fully qualified name = mxt13.test.ex
+ host_find_bydns yield = HOST_FOUND (3); returned hosts:
+   other1.test.ex V4NET.12.4.5 MX=4 
 set transport smtp
 queued for smtp transport: local_part = k
 domain = mxt13.test.ex

diff --git a/test/stderr/0426 b/test/stderr/0426
index 8ae6452dab350b239d40a49dcecc105b63babead..acb3e94091cd3e58fecb9529578852b3bd8f7702 100644 (file)
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -28,12 +28,13 @@ local_part=x domain=uppercase.test.ex
 calling r1 router
 r1 router called for x@uppercase.test.ex
   domain = uppercase.test.ex
-check dnssec require list
-check dnssec request list
-uppercase.test.ex (MX resp) DNSSEC
+main lookup for domain
+ check dnssec require list
+ check dnssec request list
+ uppercase.test.ex (MX resp) DNSSEC
 local host found for non-MX address
-fully qualified name = UpperCase.test.ex
-uppercase.test.ex 127.0.0.1 mx=-1 sort=xx 
+ fully qualified name = UpperCase.test.ex
+ uppercase.test.ex 127.0.0.1 mx=-1 sort=xx 
 remote host address is the local host: uppercase.test.ex: configured to try delivery anyway
 set transport t1
 queued for t1 transport: local_part = x

diff --git a/test/stderr/0443 b/test/stderr/0443
index e1c28db8330434bbbe2fdb544033cccd5af4d767..75884eae0ea1dc1823b576e601cabce001d8340a 100644 (file)
--- a/test/stderr/0443
+++ b/test/stderr/0443
@@ -16,12 +16,12 @@
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1.test.ex
 >>> calling r1 router
->>> check dnssec require list
->>>  ten-1.test.ex in dnssec_require_domains? no (option unset)
->>> check dnssec request list
->>>  ten-1.test.ex in dnssec_request_domains?
->>>   list element: *
->>>   ten-1.test.ex in dnssec_request_domains? yes (matched "*")
+>>>  check dnssec require list
+>>>   ten-1.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   ten-1.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    ten-1.test.ex in dnssec_request_domains? yes (matched "*")
 >>> routed by r1 router
 >>> Attempting full verification using callout
 >>> callout cache: no domain record found for ten-1.test.ex

diff --git a/test/stderr/0463 b/test/stderr/0463
index efe4fed19d3511ffc34b98d934f42f3387a2f799..e12674204c79ecc090259af8c602410964e1c125 100644 (file)
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -24,28 +24,29 @@ ten-1 in domains?
  DNS lookup of ten-1 (MX) gave NO_DATA
  returning DNS_NODATA
  faking res_search(MX) response length as 65535
-  writing neg-cache entry for ten-1-MX-4100041, ttl 3000
+  writing neg-cache entry for ten-1-MX-xxxx, ttl 3000
  Address records are not being sought
 ten-1 in domains? yes (end of list)
 calling all router
 all router called for x@ten-1
   domain = ten-1
-check dnssec require list
- ten-1 in dnssec_require_domains? no (option unset)
-check dnssec request list
- ten-1 in dnssec_request_domains?
-  list element: *
-  ten-1 in dnssec_request_domains? yes (matched "*")
-DNS lookup of ten-1 (MX) using fakens
-DNS lookup of ten-1 (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for ten-1-MX-xxxx, ttl 3000
-ten-1 (MX resp) DNSSEC
-DNS lookup of ten-1 (A) using fakens
-DNS lookup of ten-1 (A) succeeded
-fully qualified name = ten-1.test.ex
-ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
+main lookup for domain
+ check dnssec require list
+  ten-1 in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  ten-1 in dnssec_request_domains?
+   list element: *
+   ten-1 in dnssec_request_domains? yes (matched "*")
+ DNS lookup of ten-1 (MX) using fakens
+ DNS lookup of ten-1 (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for ten-1-MX-xxxx, ttl 3000
+ ten-1 (MX resp) DNSSEC
+ DNS lookup of ten-1 (A) using fakens
+ DNS lookup of ten-1 (A) succeeded
+ fully qualified name = ten-1.test.ex
+ ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
 domain changed to ten-1.test.ex
 rewriting header lines
 re-routed to x@ten-1.test.ex
@@ -64,28 +65,29 @@ ten-1.test.ex in domains?
  DNS lookup of ten-1.test.ex (MX) gave NO_DATA
  returning DNS_NODATA
  faking res_search(MX) response length as 65535
-  writing neg-cache entry for ten-1.test.ex-MX-4900041, ttl 3000
+  writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
  Address records are not being sought
 ten-1.test.ex in domains? yes (end of list)
 calling all router
 all router called for x@ten-1.test.ex
   domain = ten-1.test.ex
-check dnssec require list
- ten-1.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- ten-1.test.ex in dnssec_request_domains?
-  list element: *
-  ten-1.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of ten-1.test.ex (MX) using fakens
-DNS lookup of ten-1.test.ex (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
-ten-1.test.ex (MX resp) DNSSEC
-DNS lookup of ten-1.test.ex (A) using fakens
-DNS lookup of ten-1.test.ex (A) succeeded
-fully qualified name = ten-1.test.ex
-ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
+main lookup for domain
+ check dnssec require list
+  ten-1.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  ten-1.test.ex in dnssec_request_domains?
+   list element: *
+   ten-1.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of ten-1.test.ex (MX) using fakens
+ DNS lookup of ten-1.test.ex (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
+ ten-1.test.ex (MX resp) DNSSEC
+ DNS lookup of ten-1.test.ex (A) using fakens
+ DNS lookup of ten-1.test.ex (A) succeeded
+ fully qualified name = ten-1.test.ex
+ ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
 set transport smtp
 queued for smtp transport: local_part = x
 domain = ten-1.test.ex

diff --git a/test/stderr/0469 b/test/stderr/0469
index a29d7763cb447d6f8bff55c8270db67218df7b7b..0fcb7f8c26bffcb52fb77de993cfb34ba6d76ee8 100644 (file)
--- a/test/stderr/0469
+++ b/test/stderr/0469
@@ -18,23 +18,24 @@ local_part=x domain=mxt1c.test.ex
 calling r1 router
 r1 router called for x@mxt1c.test.ex
   domain = mxt1c.test.ex
-check dnssec require list
- mxt1c.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- mxt1c.test.ex in dnssec_request_domains?
-  list element: *
-  mxt1c.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of mxt1c.test.ex (MX) using fakens
-DNS lookup of mxt1c.test.ex (MX) succeeded
-DNS lookup of dontqualify (A) using fakens
-DNS lookup of dontqualify (A) gave NO_DATA
-returning DNS_NODATA
-DNS: couldn't fake dnsa len
-DNS: no SOA record found for neg-TTL
- writing neg-cache entry for dontqualify-A-xxxx, ttl -1
-fully qualified name = mxt1c.test.ex
-host_find_bydns yield = HOST_FIND_FAILED (0); returned hosts:
-  dontqualify <null> MX=1 *
+main lookup for domain
+ check dnssec require list
+  mxt1c.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  mxt1c.test.ex in dnssec_request_domains?
+   list element: *
+   mxt1c.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of mxt1c.test.ex (MX) using fakens
+ DNS lookup of mxt1c.test.ex (MX) succeeded
+ DNS lookup of dontqualify (A) using fakens
+ DNS lookup of dontqualify (A) gave NO_DATA
+ returning DNS_NODATA
+ DNS: couldn't fake dnsa len
+ DNS: no SOA record found for neg-TTL
+  writing neg-cache entry for dontqualify-A-xxxx, ttl -1
+ fully qualified name = mxt1c.test.ex
+ host_find_bydns yield = HOST_FIND_FAILED (0); returned hosts:
+   dontqualify <null> MX=1 *
 r1 router declined for x@mxt1c.test.ex
 no more routers
 search_tidyup called

diff --git a/test/stderr/0513 b/test/stderr/0513
index 53c05b205f5b003921a2adc5a5f5da4ae3f6ca8e..e76e994f20cd8d0fdc3ffefca66be8c9670f7758 100644 (file)
--- a/test/stderr/0513
+++ b/test/stderr/0513
@@ -24,12 +24,12 @@
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@mxt2.test.ex
 >>> calling r1 router
->>> check dnssec require list
->>>  mxt2.test.ex in dnssec_require_domains? no (option unset)
->>> check dnssec request list
->>>  mxt2.test.ex in dnssec_request_domains?
->>>   list element: *
->>>   mxt2.test.ex in dnssec_request_domains? yes (matched "*")
+>>>  check dnssec require list
+>>>   mxt2.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   mxt2.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    mxt2.test.ex in dnssec_request_domains? yes (matched "*")
 >>> r1 router declined for x@mxt2.test.ex
 >>> no more routers
 >>> ----------- end verify ------------

diff --git a/test/stderr/0545 b/test/stderr/0545
index 174c8508a5800cbaf69a12be16ad095248ece354..25f935ced11a09ef605ade35f00bbda73febb17b 100644 (file)
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -18,29 +18,30 @@ local_part=userx domain=alias-eximtesthost
 calling dns router
 dns router called for userx@alias-eximtesthost
   domain = alias-eximtesthost
-check dnssec require list
- alias-eximtesthost in dnssec_require_domains? no (option unset)
-check dnssec request list
- alias-eximtesthost in dnssec_request_domains?
-  list element: *
-  alias-eximtesthost in dnssec_request_domains? yes (matched "*")
-DNS lookup of alias-eximtesthost (MX) using fakens
-DNS lookup of alias-eximtesthost (MX) succeeded
-CNAME found: change to eximtesthost.test.ex
-DNS lookup of eximtesthost.test.ex (MX) using fakens
-DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000
-alias-eximtesthost (MX resp) DNSSEC
-DNS lookup of alias-eximtesthost (A) using fakens
-DNS lookup of alias-eximtesthost (A) succeeded
-CNAME found: change to eximtesthost.test.ex
-DNS lookup of eximtesthost.test.ex (A) using fakens
-DNS lookup of eximtesthost.test.ex (A) succeeded
+main lookup for domain
+ check dnssec require list
+  alias-eximtesthost in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  alias-eximtesthost in dnssec_request_domains?
+   list element: *
+   alias-eximtesthost in dnssec_request_domains? yes (matched "*")
+ DNS lookup of alias-eximtesthost (MX) using fakens
+ DNS lookup of alias-eximtesthost (MX) succeeded
+ CNAME found: change to eximtesthost.test.ex
+ DNS lookup of eximtesthost.test.ex (MX) using fakens
+ DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000
+ alias-eximtesthost (MX resp) DNSSEC
+ DNS lookup of alias-eximtesthost (A) using fakens
+ DNS lookup of alias-eximtesthost (A) succeeded
+ CNAME found: change to eximtesthost.test.ex
+ DNS lookup of eximtesthost.test.ex (A) using fakens
+ DNS lookup of eximtesthost.test.ex (A) succeeded
 local host found for non-MX address
-fully qualified name = alias-eximtesthost.test.ex
-eximtesthost.test.ex ip4.ip4.ip4.ip4 mx=-1 sort=xx 
+ fully qualified name = alias-eximtesthost.test.ex
+ eximtesthost.test.ex ip4.ip4.ip4.ip4 mx=-1 sort=xx 
 domain changed to alias-eximtesthost.test.ex
 rewriting header lines
 re-routed to userx@alias-eximtesthost.test.ex
@@ -53,24 +54,25 @@ local_part=userx domain=alias-eximtesthost.test.ex
 calling dns router
 dns router called for userx@alias-eximtesthost.test.ex
   domain = alias-eximtesthost.test.ex
-check dnssec require list
- alias-eximtesthost.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- alias-eximtesthost.test.ex in dnssec_request_domains?
-  list element: *
-  alias-eximtesthost.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
-DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
-CNAME found: change to eximtesthost.test.ex
-DNS lookup of eximtesthost.test.ex (MX): using cached value DNS_NODATA
-DNS lookup of alias-eximtesthost.test.ex (A) using fakens
-DNS lookup of alias-eximtesthost.test.ex (A) succeeded
-CNAME found: change to eximtesthost.test.ex
-DNS lookup of eximtesthost.test.ex (A) using fakens
-DNS lookup of eximtesthost.test.ex (A) succeeded
+main lookup for domain
+ check dnssec require list
+  alias-eximtesthost.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  alias-eximtesthost.test.ex in dnssec_request_domains?
+   list element: *
+   alias-eximtesthost.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
+ DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
+ CNAME found: change to eximtesthost.test.ex
+ DNS lookup of eximtesthost.test.ex (MX): using cached value DNS_NODATA
+ DNS lookup of alias-eximtesthost.test.ex (A) using fakens
+ DNS lookup of alias-eximtesthost.test.ex (A) succeeded
+ CNAME found: change to eximtesthost.test.ex
+ DNS lookup of eximtesthost.test.ex (A) using fakens
+ DNS lookup of eximtesthost.test.ex (A) succeeded
 local host found for non-MX address
-fully qualified name = alias-eximtesthost.test.ex
-eximtesthost.test.ex ip4.ip4.ip4.ip4 mx=-1 sort=xx 
+ fully qualified name = alias-eximtesthost.test.ex
+ eximtesthost.test.ex ip4.ip4.ip4.ip4 mx=-1 sort=xx 
 remote host address is the local host: alias-eximtesthost.test.ex: configured to try delivery anyway
 set transport smtp
 queued for smtp transport: local_part = userx
@@ -103,29 +105,30 @@ local_part=userx domain=alias-eximtesthost.test.ex
 calling dns router
 dns router called for userx@alias-eximtesthost.test.ex
   domain = alias-eximtesthost.test.ex
-check dnssec require list
- alias-eximtesthost.test.ex in dnssec_require_domains? no (option unset)
-check dnssec request list
- alias-eximtesthost.test.ex in dnssec_request_domains?
-  list element: *
-  alias-eximtesthost.test.ex in dnssec_request_domains? yes (matched "*")
-DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
-DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
-CNAME found: change to eximtesthost.test.ex
-DNS lookup of eximtesthost.test.ex (MX) using fakens
-DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000
-alias-eximtesthost.test.ex (MX resp) DNSSEC
-DNS lookup of alias-eximtesthost.test.ex (A) using fakens
-DNS lookup of alias-eximtesthost.test.ex (A) succeeded
-CNAME found: change to eximtesthost.test.ex
-DNS lookup of eximtesthost.test.ex (A) using fakens
-DNS lookup of eximtesthost.test.ex (A) succeeded
+main lookup for domain
+ check dnssec require list
+  alias-eximtesthost.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  alias-eximtesthost.test.ex in dnssec_request_domains?
+   list element: *
+   alias-eximtesthost.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
+ DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
+ CNAME found: change to eximtesthost.test.ex
+ DNS lookup of eximtesthost.test.ex (MX) using fakens
+ DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000
+ alias-eximtesthost.test.ex (MX resp) DNSSEC
+ DNS lookup of alias-eximtesthost.test.ex (A) using fakens
+ DNS lookup of alias-eximtesthost.test.ex (A) succeeded
+ CNAME found: change to eximtesthost.test.ex
+ DNS lookup of eximtesthost.test.ex (A) using fakens
+ DNS lookup of eximtesthost.test.ex (A) succeeded
 local host found for non-MX address
-fully qualified name = alias-eximtesthost.test.ex
-eximtesthost.test.ex ip4.ip4.ip4.ip4 mx=-1 sort=xx 
+ fully qualified name = alias-eximtesthost.test.ex
+ eximtesthost.test.ex ip4.ip4.ip4.ip4 mx=-1 sort=xx 
 remote host address is the local host: alias-eximtesthost.test.ex: configured to try delivery anyway
 set transport smtp
 queued for smtp transport: local_part = userx

diff --git a/test/stderr/0588 b/test/stderr/0588
index 4f51c0de0d07dd4e6c0f45b53c715db6d638721b..0be237c7e9b271fe964d72aa6f0d7e3e33be759a 100644 (file)
--- a/test/stderr/0588
+++ b/test/stderr/0588
@@ -15,12 +15,12 @@
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing should_log@delay1500.test.ex
 >>> calling all router
->>> check dnssec require list
->>>  delay1500.test.ex in dnssec_require_domains? no (option unset)
->>> check dnssec request list
->>>  delay1500.test.ex in dnssec_request_domains?
->>>   list element: *
->>>   delay1500.test.ex in dnssec_request_domains? yes (matched "*")
+>>>  check dnssec require list
+>>>   delay1500.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   delay1500.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    delay1500.test.ex in dnssec_request_domains? yes (matched "*")
 LOG: Long A lookup for 'delay1500.test.ex': ssss msec
 >>> local host found for non-MX address
 >>> routed by all router
@@ -44,12 +44,12 @@ LOG: Long A lookup for 'delay1500.test.ex': ssss msec
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing should_not_log@delay500.test.ex
 >>> calling all router
->>> check dnssec require list
->>>  delay500.test.ex in dnssec_require_domains? no (option unset)
->>> check dnssec request list
->>>  delay500.test.ex in dnssec_request_domains?
->>>   list element: *
->>>   delay500.test.ex in dnssec_request_domains? yes (matched "*")
+>>>  check dnssec require list
+>>>   delay500.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   delay500.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    delay500.test.ex in dnssec_request_domains? yes (matched "*")
 >>> local host found for non-MX address
 >>> routed by all router
 >>> ----------- end verify ------------

diff --git a/test/stderr/1006 b/test/stderr/1006
index 27ff56df39d66d287e7bb990d61760d17b9461f0..de73350f1a51081daf0743ab69e49223ba7ddefa 100644 (file)
--- a/test/stderr/1006
+++ b/test/stderr/1006
@@ -2,48 +2,48 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-DNS lookup of mx46.test.ex (MX) using fakens
-DNS lookup of mx46.test.ex (MX) succeeded
-DNS lookup of 46.test.ex (AAAA) succeeded
-DNS lookup of 46.test.ex (A) using fakens
-DNS lookup of 46.test.ex (A) succeeded
+ DNS lookup of mx46.test.ex (MX) using fakens
+ DNS lookup of mx46.test.ex (MX) succeeded
+ DNS lookup of 46.test.ex (AAAA) succeeded
+ DNS lookup of 46.test.ex (A) using fakens
+ DNS lookup of 46.test.ex (A) succeeded
 manualroute in local_parts? no (end of list)
 DNS lookup of 46.test.ex (AAAA) succeeded
 DNS lookup of 46.test.ex (A) using fakens
 DNS lookup of 46.test.ex (A) succeeded
-DNS lookup of v6.test.ex (MX) using fakens
-DNS lookup of v6.test.ex (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
-DNS lookup of v6.test.ex (AAAA) succeeded
-DNS lookup of v6.test.ex (A) using fakens
-DNS lookup of v6.test.ex (A) gave NO_DATA
-returning DNS_NODATA
-faking res_search(A) response length as 65535
- writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000
+ DNS lookup of v6.test.ex (MX) using fakens
+ DNS lookup of v6.test.ex (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
+ DNS lookup of v6.test.ex (AAAA) succeeded
+ DNS lookup of v6.test.ex (A) using fakens
+ DNS lookup of v6.test.ex (A) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(A) response length as 65535
+  writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-DNS lookup of mx46.test.ex (MX) using fakens
-DNS lookup of mx46.test.ex (MX) succeeded
-DNS lookup of 46.test.ex (A) using fakens
-DNS lookup of 46.test.ex (A) succeeded
+ DNS lookup of mx46.test.ex (MX) using fakens
+ DNS lookup of mx46.test.ex (MX) succeeded
+ DNS lookup of 46.test.ex (A) using fakens
+ DNS lookup of 46.test.ex (A) succeeded
 manualroute in local_parts? no (end of list)
 DNS lookup of 46.test.ex (A) using fakens
 DNS lookup of 46.test.ex (A) succeeded
-DNS lookup of v6.test.ex (MX) using fakens
-DNS lookup of v6.test.ex (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
-DNS lookup of v6.test.ex (A) using fakens
-DNS lookup of v6.test.ex (A) gave NO_DATA
-returning DNS_NODATA
-faking res_search(A) response length as 65535
- writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000
+ DNS lookup of v6.test.ex (MX) using fakens
+ DNS lookup of v6.test.ex (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
+ DNS lookup of v6.test.ex (A) using fakens
+ DNS lookup of v6.test.ex (A) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(A) response length as 65535
+  writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000
 dnslookup in local_parts? no (end of list)
 >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
 

diff --git a/test/stderr/2201 b/test/stderr/2201
index 8435a405294bee8d7b98e965f0c24c53dd3f96b0..0cee0c364164f822904f5c63e1e13c3782411d76 100644 (file)
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -115,7 +115,7 @@ unknown in local_parts?
  DNS lookup of unknown (TXT) gave HOST_NOT_FOUND
  returning DNS_NOMATCH
  faking res_search(TXT) response length as 65535
-  writing neg-cache entry for unknown-TXT-4900041, ttl 3000
+  writing neg-cache entry for unknown-TXT-xxxx, ttl 3000
  creating new cache entry
  lookup failed
 unknown in local_parts? no (end of list)

diff --git a/test/stderr/2202 b/test/stderr/2202
index b49cf18fed76c08d38269bd4c4d6e939bf3b984d..8472e8086cfbc093d938224410f27444e38bb637 100644 (file)
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -56,7 +56,7 @@ check hosts = +ignore_unknown : *.$sender_address_domain : $sender_address_domai
  cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH
  DNS: couldn't fake dnsa len
  DNS: no SOA record found for neg-TTL
-  writing neg-cache entry for cioce.test.again.dns-MX-4900041, ttl -1
+  writing neg-cache entry for cioce.test.again.dns-MX-xxxx, ttl -1
  creating new cache entry
  lookup failed
 host in "+ignore_unknown : *.cioce.test.again.dns : cioce.test.again.dns : "?
@@ -90,7 +90,7 @@ using host_fake_gethostbyname for cioce.test.again.dns (IPv4)
  cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH
  DNS: couldn't fake dnsa len
  DNS: no SOA record found for neg-TTL
-  writing neg-cache entry for cioce.test.again.dns-A-49000c1, ttl -1
+  writing neg-cache entry for cioce.test.again.dns-A-xxxx, ttl -1
 host_fake_gethostbyname(af=inet) returned 1 (HOST_NOT_FOUND)
 no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4])
 LOG: host_lookup_failed MAIN

diff --git a/test/stderr/3211 b/test/stderr/3211
index ef339abf62f45fe2bd1a48ed55ceb8883c678e42..d6d923d6be85897cc8665a8e9451ed20fafd7347 100644 (file)
--- a/test/stderr/3211
+++ b/test/stderr/3211
@@ -19,14 +19,14 @@
 >>> calling skipped router
 >>> skipped router declined for userx@test.again.dns
 >>> calling temp router
->>> check dnssec require list
->>>  test.again.dns in dnssec_require_domains? no (option unset)
->>> check dnssec request list
->>>  test.again.dns in dnssec_request_domains?
->>>   list element: *
->>>   test.again.dns in dnssec_request_domains? yes (matched "*")
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> test.again.dns not in empty list (option unset? cannot trace name)
+>>>  check dnssec require list
+>>>   test.again.dns in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   test.again.dns in dnssec_request_domains?
+>>>    list element: *
+>>>    test.again.dns in dnssec_request_domains? yes (matched "*")
+>>>  test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  test.again.dns not in empty list (option unset? cannot trace name)
 >>> temp router: defer for userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
@@ -53,14 +53,14 @@ LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.
 >>>  list element: !testdb;fail
 >>> test.again.dns in domains? yes (end of list)
 >>> calling r1 router
->>> check dnssec require list
->>>  test.again.dns in dnssec_require_domains? no (option unset)
->>> check dnssec request list
->>>  test.again.dns in dnssec_request_domains?
->>>   list element: *
->>>   test.again.dns in dnssec_request_domains? yes (matched "*")
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> test.again.dns not in empty list (option unset? cannot trace name)
+>>>  check dnssec require list
+>>>   test.again.dns in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   test.again.dns in dnssec_request_domains?
+>>>    list element: *
+>>>    test.again.dns in dnssec_request_domains? yes (matched "*")
+>>>  test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  test.again.dns not in empty list (option unset? cannot trace name)
 >>> r1 router: defer for r1-userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------

diff --git a/test/stderr/4802 b/test/stderr/4802
index 25abeaef63d646198489d44d3fda12d1ee8f7e20..4dc96971b31ce81d1b2467aa49e1307b73432ece 100644 (file)
--- a/test/stderr/4802
+++ b/test/stderr/4802
@@ -2,19 +2,19 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
-DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
-DNS lookup of a-aa.test.ex (A) using fakens
-DNS lookup of a-aa.test.ex (A) succeeded
+ DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
+ DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
+ DNS lookup of a-aa.test.ex (A) using fakens
+ DNS lookup of a-aa.test.ex (A) succeeded
 DNS lookup of a-aa.test.ex (A/AAAA) requested AD, but got AA
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
-DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
-DNS lookup of mx-aa-a-sec.test.ex (MX) requested AD, but got AA
-DNS lookup of a-sec.test.ex (A) using fakens
-DNS lookup of a-sec.test.ex (A) succeeded
+ DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
+ DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
+ DNS lookup of mx-aa-a-sec.test.ex (MX) requested AD, but got AA
+ DNS lookup of a-sec.test.ex (A) using fakens
+ DNS lookup of a-sec.test.ex (A) succeeded
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/4803 b/test/stderr/4803
index 1f55809faed39915db70dd09f627e076508ccaa1..ff308e31d96d3758b8552d1fa1939419e954bc77 100644 (file)
--- a/test/stderr/4803
+++ b/test/stderr/4803
@@ -2,23 +2,23 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
-DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
-DNS lookup of a-aa.test.ex (A) using fakens
-DNS lookup of a-aa.test.ex (A) succeeded
-DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
-DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
-DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
+ DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
+ DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
+ DNS lookup of a-aa.test.ex (A) using fakens
+ DNS lookup of a-aa.test.ex (A) succeeded
+ DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
+ DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
+ DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
-DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
-DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
-DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
-DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
-DNS lookup of a-sec.test.ex (A) using fakens
-DNS lookup of a-sec.test.ex (A) succeeded
+ DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
+ DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
+ DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
+ DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
+ DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
+ DNS lookup of a-sec.test.ex (A) using fakens
+ DNS lookup of a-sec.test.ex (A) succeeded
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/5820 b/test/stderr/5820
index 43a5f5dfde85d82466647726c4b05156bc0417e1..362fffd9499ac8b57769f59902cfebeb5c14ac19 100644 (file)
--- a/test/stderr/5820
+++ b/test/stderr/5820
@@ -18,12 +18,12 @@
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing rcptuser@dane256ee.test.ex
 >>> calling client router
->>> check dnssec require list
->>>  dane256ee.test.ex in dnssec_require_domains? no (option unset)
->>> check dnssec request list
->>>  dane256ee.test.ex in dnssec_request_domains?
->>>   list element: *
->>>   dane256ee.test.ex in dnssec_request_domains? yes (matched "*")
+>>>  check dnssec require list
+>>>   dane256ee.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   dane256ee.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    dane256ee.test.ex in dnssec_request_domains? yes (matched "*")
 >>> local host found for non-MX address
 >>> routed by client router
 >>> Attempting full verification using callout