From 27085351db1c6cdbbea742a1da15a3e3e912a844 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 1 Sep 2019 21:47:11 +0100
Subject: [PATCH] Testsuite: platform differences for resolver flags bits

---
 test/runtest     |  3 +++
 test/stderr/0183 | 28 ++++++++++++++--------------
 test/stderr/0277 |  8 ++++----
 test/stderr/0278 |  4 ++--
 test/stderr/0361 |  4 ++--
 test/stderr/0463 |  8 ++++----
 test/stderr/0469 |  2 +-
 test/stderr/0545 |  4 ++--
 test/stderr/1006 |  8 ++++----
 test/stderr/2201 |  2 +-
 test/stderr/2202 |  4 ++--
 11 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/test/runtest b/test/runtest
index 1df7fc718..1ef31c3dc 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1158,6 +1158,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     # Platform-dependent error strings
     s/Operation timed out/Connection timed out/;
 
+    # Platform-dependent resolver option bits
+    s/^ writing neg-cache entry for [^,]+-\K[0-9a-f]+, ttl/xxxx, ttl/;
+
     # Skip hosts_require_dane checks when the options
     # are unset, because dane ain't always there.
     next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
diff --git a/test/stderr/0183 b/test/stderr/0183
index 24fcc5015..a199e58fe 100644
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -34,7 +34,7 @@ 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-c1, ttl -1
+ writing neg-cache entry for test.again.dns-MX-xxxx, ttl -1
 lookuphost router: defer for userx@test.again.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -89,7 +89,7 @@ lookuphost router called for abcd@ten-1.test.ex
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
- writing neg-cache entry for ten-1.test.ex-MX-c1, ttl 3600
+ writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3600
 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
@@ -132,7 +132,7 @@ 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)
 returning DNS_AGAIN
- writing neg-cache entry for test.again.dns-A-41, ttl -1
+ writing neg-cache entry for test.again.dns-A-xxxx, ttl -1
 useryz router: defer for usery@test.again.dns
   message: host lookup for test.again.dns did not complete (DNS timeout?)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -235,7 +235,7 @@ lookuphost router called for userx@test.fail.dns
 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-c1, ttl -1
+ writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1
 lookuphost router: defer for userx@test.fail.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -290,7 +290,7 @@ lookuphost router called for abcd@ten-1.test.ex
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
- writing neg-cache entry for ten-1.test.ex-MX-c1, ttl 3600
+ writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3600
 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
@@ -332,7 +332,7 @@ doing DNS lookup
 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-41, ttl -1
+ writing neg-cache entry for test.fail.dns-A-xxxx, ttl -1
 useryz router: defer for usery@test.fail.dns
   message: host lookup for test.fail.dns did not complete (DNS timeout?)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -435,7 +435,7 @@ lookuphost router called for userx@nonexist.test.ex
 DNS lookup of nonexist.test.ex (MX) using fakens
 DNS lookup of nonexist.test.ex (MX) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
- writing neg-cache entry for nonexist.test.ex-MX-c1, ttl 3600
+ writing neg-cache entry for nonexist.test.ex-MX-xxxx, ttl 3600
 lookuphost router declined for userx@nonexist.test.ex
 "more" is false: skipping remaining routers
 no more routers
@@ -492,7 +492,7 @@ lookuphost router called for abcd@ten-1.test.ex
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
- writing neg-cache entry for ten-1.test.ex-MX-c1, ttl 3600
+ writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3600
 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
@@ -534,7 +534,7 @@ doing DNS lookup
 DNS lookup of nonexist.test.ex (A) using fakens
 DNS lookup of nonexist.test.ex (A) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
- writing neg-cache entry for nonexist.test.ex-A-41, ttl 3600
+ writing neg-cache entry for nonexist.test.ex-A-xxxx, ttl 3600
 useryz router: defer for usery@nonexist.test.ex
   message: lookup of host "nonexist.test.ex" failed in useryz router
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -628,7 +628,7 @@ 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-c1, ttl -1
+ writing neg-cache entry for _smtp._tcp.test.again.dns-SRV-xxxx, ttl -1
 test.again.dns in "test.fail.dns"? no (end of list)
 srv router: defer for srv@test.again.dns
   message: host lookup did not complete
@@ -648,19 +648,19 @@ srv router called for srv@test.fail.dns
 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-c1, ttl -1
+ writing neg-cache entry for _smtp._tcp.test.fail.dns-SRV-xxxx, ttl -1
 test.fail.dns in "test.fail.dns"? 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-c1, ttl -1
+ writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1
 test.fail.dns in "test.fail.dns"? 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-c1, ttl -1
+ 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
@@ -700,7 +700,7 @@ lookuphost router called for userx@nonexist.example.com
 DNS lookup of nonexist.example.com (MX) using fakens
 DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
- writing neg-cache entry for nonexist.example.com-MX-c1, ttl 2
+ 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
diff --git a/test/stderr/0277 b/test/stderr/0277
index 3d9490f72..a28a021b0 100644
--- a/test/stderr/0277
+++ b/test/stderr/0277
@@ -19,7 +19,7 @@ DNS lookup of 4.3.2.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 4.3.2.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
 DNS: no SOA record found for neg-TTL
- writing neg-cache entry for 4.3.2.V4NET.in-addr.arpa-PTR-41, 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]
@@ -97,7 +97,7 @@ DNS lookup of 12.11.10.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 12.11.10.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
 DNS: no SOA record found for neg-TTL
- writing neg-cache entry for 12.11.10.V4NET.in-addr.arpa-PTR-41, 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]
@@ -142,7 +142,7 @@ DNS lookup of 1.1.1.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 1.1.1.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
 DNS: no SOA record found for neg-TTL
- writing neg-cache entry for 1.1.1.V4NET.in-addr.arpa-PTR-41, 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]
@@ -187,7 +187,7 @@ DNS lookup of 2.2.2.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 2.2.2.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
 DNS: no SOA record found for neg-TTL
- writing neg-cache entry for 2.2.2.V4NET.in-addr.arpa-PTR-41, 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 ae86f8ca4..cb6800cc1 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -291,11 +291,11 @@ r2 router called for unknown@test.ex
 DNS lookup of test.ex (MX) using fakens
 DNS lookup of test.ex (MX) gave NO_DATA
 returning DNS_NODATA
- writing neg-cache entry for test.ex-MX-c1, ttl 3600
+ writing neg-cache entry for test.ex-MX-xxxx, ttl 3600
 DNS lookup of test.ex (A) using fakens
 DNS lookup of test.ex (A) gave NO_DATA
 returning DNS_NODATA
- writing neg-cache entry for test.ex-A-c1, ttl 3600
+ writing neg-cache entry for test.ex-A-xxxx, ttl 3600
 r2 router declined for unknown@test.ex
 --------> r3 router <--------
 local_part=unknown domain=test.ex
diff --git a/test/stderr/0361 b/test/stderr/0361
index 81d9778c8..dd9b3bedc 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -99,12 +99,12 @@ r1 router called for kilos@recurse.test.ex
 DNS lookup of recurse.test.ex (MX) using fakens
 DNS lookup of recurse.test.ex (MX) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
- writing neg-cache entry for recurse.test.ex-MX-c1, ttl 3600
+ writing neg-cache entry for recurse.test.ex-MX-xxxx, ttl 3600
 r1 router widened recurse.test.ex to recurse.test.ex.test.ex
 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
- writing neg-cache entry for recurse.test.ex.test.ex-MX-c1, ttl 3600
+ writing neg-cache entry for recurse.test.ex.test.ex-MX-xxxx, ttl 3600
 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
diff --git a/test/stderr/0463 b/test/stderr/0463
index 48b2d4bf8..0aea730fc 100644
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -19,7 +19,7 @@ checking domains
 DNS lookup of ten-1 (MX) using fakens
 DNS lookup of ten-1 (MX) gave NO_DATA
 returning DNS_NODATA
- writing neg-cache entry for ten-1-MX-41, ttl 3600
+ writing neg-cache entry for ten-1-MX-xxxx, ttl 3600
 Address records are not being sought
 ten-1 in "!@mx_any"? yes (end of list)
 calling all router
@@ -28,7 +28,7 @@ all router called for x@ten-1
 DNS lookup of ten-1 (MX) using fakens
 DNS lookup of ten-1 (MX) gave NO_DATA
 returning DNS_NODATA
- writing neg-cache entry for ten-1-MX-c1, ttl 3600
+ writing neg-cache entry for ten-1-MX-xxxx, ttl 3600
 DNS lookup of ten-1 (A) using fakens
 DNS lookup of ten-1 (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -46,7 +46,7 @@ checking domains
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
- writing neg-cache entry for ten-1.test.ex-MX-41, ttl 3600
+ writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3600
 Address records are not being sought
 ten-1.test.ex in "!@mx_any"? yes (end of list)
 calling all router
@@ -55,7 +55,7 @@ all router called for x@ten-1.test.ex
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
- writing neg-cache entry for ten-1.test.ex-MX-c1, ttl 3600
+ writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3600
 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
diff --git a/test/stderr/0469 b/test/stderr/0469
index 9dae8fc14..915bd5ab2 100644
--- a/test/stderr/0469
+++ b/test/stderr/0469
@@ -25,7 +25,7 @@ fakens returned PASS_ON
 passing dontqualify on to res_search()
 DNS lookup of dontqualify (A) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
- writing neg-cache entry for dontqualify-A-41, ttl 86400
+ writing neg-cache entry for dontqualify-A-xxxx, ttl 86400
 fully qualified name = mxt1c.test.ex
 host_find_bydns yield = HOST_FIND_FAILED (0); returned hosts:
   dontqualify <null> MX=1 *
diff --git a/test/stderr/0545 b/test/stderr/0545
index 50658a6ef..107bcca22 100644
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -24,7 +24,7 @@ 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
- writing neg-cache entry for eximtesthost.test.ex-MX-c1, ttl 3600
+ writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3600
 DNS lookup of alias-eximtesthost (A) using fakens
 DNS lookup of alias-eximtesthost (A) succeeded
 CNAME found: change to eximtesthost.test.ex
@@ -95,7 +95,7 @@ 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
- writing neg-cache entry for eximtesthost.test.ex-MX-c1, ttl 3600
+ writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3600
 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
diff --git a/test/stderr/1006 b/test/stderr/1006
index 8d8771e9c..e7bf00ee4 100644
--- a/test/stderr/1006
+++ b/test/stderr/1006
@@ -13,12 +13,12 @@ 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
- writing neg-cache entry for v6.test.ex-MX-c1, ttl 3600
+ writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3600
 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
- writing neg-cache entry for v6.test.ex-A-c1, ttl 3600
+ writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3600
 >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
@@ -33,11 +33,11 @@ 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
- writing neg-cache entry for v6.test.ex-MX-c1, ttl 3600
+ writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3600
 DNS lookup of v6.test.ex (A) using fakens
 DNS lookup of v6.test.ex (A) gave NO_DATA
 returning DNS_NODATA
- writing neg-cache entry for v6.test.ex-A-c1, ttl 3600
+ writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3600
 >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
 
 ******** SERVER ********
diff --git a/test/stderr/2201 b/test/stderr/2201
index 7e8d8a806..ac812c1db 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -99,7 +99,7 @@ dnsdb key: unknown
 DNS lookup of unknown (TXT) using fakens
 DNS lookup of unknown (TXT) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
- writing neg-cache entry for unknown-TXT-41, ttl 3600
+ writing neg-cache entry for unknown-TXT-xxxx, ttl 3600
 lookup failed
 unknown in "dnsdb;unknown"? no (end of list)
 r1 router skipped: local_parts mismatch
diff --git a/test/stderr/2202 b/test/stderr/2202
index 9543fb1b1..46e172c1a 100644
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -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
- 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
@@ -65,7 +65,7 @@ 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
- writing neg-cache entry for cioce.test.again.dns-A-c1, ttl -1
+ writing neg-cache entry for cioce.test.again.dns-A-xxxx, ttl -1
 get[host|ipnode]byname[2] 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
-- 
2.25.1