Bodge adns_r_addr query-id selection and fix regression tests to match.

A future change is going to change how query-ids are allocated for
adns_r_addr queries.  So here we apply a simple bodge which will produce
the same allocation pattern, but without the complexity of the rest of
the change, and fix the test suite to match.

I used the script regress/hack-query-ids to help me modify the
case-*.sys files, though this was primarily a rather tedious manual
process.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

1 files changed, 26 insertions, 26 deletions

diff --git a/regress/case-manyptrwrong.out b/regress/case-manyptrwrong.out
index 819a929..6a5309b 100644
--- a/regress/case-manyptrwrong.out
+++ b/regress/case-manyptrwrong.out
@@ -110,32 +110,32 @@ adns debug: TCP connected (NS=195.224.55.129)
  ns.asis.org.nz
  ns.bouquets.co.nz
  agate.co.nz
-adns debug: reply not found, id 313b, query owner security.gen.nz (NS=195.224.55.129)
-adns debug: reply not found, id 313c, query owner ns.tetra.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 313d, query owner mail.tetra.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 313e, query owner ns.securicard.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 313f, query owner ns.underhour.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3140, query owner bcc.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3141, query owner security.org.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3142, query owner burglaralarms.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3143, query owner ns.safes.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3144, query owner ns.security.org.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3145, query owner couperconsulting.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3146, query owner securityguards.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3147, query owner ns.guards.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3148, query owner asis.org.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3149, query owner neru.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 314a, query owner giftbasket.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 314b, query owner magic.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 314c, query owner mail.bcc.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 314d, query owner ns.investigation.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 314e, query owner nzipi.org.nz (NS=195.224.55.129)
-adns debug: reply not found, id 314f, query owner ns.bouquet.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3150, query owner mail.safes.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3151, query owner ns.bcc.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3152, query owner ns.burglaralarms.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 3153, query owner ns.securityguards.co.nz (NS=195.224.55.129)
-adns debug: reply not found, id 318b, query owner agate.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 313c, query owner security.gen.nz (NS=195.224.55.129)
+adns debug: reply not found, id 313d, query owner ns.tetra.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 313e, query owner mail.tetra.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 313f, query owner ns.securicard.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3140, query owner ns.underhour.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3141, query owner bcc.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3142, query owner security.org.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3143, query owner burglaralarms.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3144, query owner ns.safes.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3145, query owner ns.security.org.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3146, query owner couperconsulting.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3147, query owner securityguards.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3148, query owner ns.guards.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3149, query owner asis.org.nz (NS=195.224.55.129)
+adns debug: reply not found, id 314a, query owner neru.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 314b, query owner giftbasket.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 314c, query owner magic.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 314d, query owner mail.bcc.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 314e, query owner ns.investigation.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 314f, query owner nzipi.org.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3150, query owner ns.bouquet.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3151, query owner mail.safes.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3152, query owner ns.bcc.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3153, query owner ns.burglaralarms.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 3154, query owner ns.securityguards.co.nz (NS=195.224.55.129)
+adns debug: reply not found, id 318c, query owner agate.co.nz (NS=195.224.55.129)
 254.0.99.203.in-addr.arpa flags 0 type PTR(checked): Inconsistent resource records in DNS; nrrs=0; cname=$; owner=$; ttl=80790
 254.0.99.203.in-addr.arpa flags 0 type A(-): No such data; nrrs=0; cname=$; owner=$; ttl=86400
 254.0.99.203.in-addr.arpa flags 0 type NS(raw): No such data; nrrs=0; cname=$; owner=$; ttl=86400