From b7be0042881e59f45a4c553db770abbbeb4871d9 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 7 Jun 2014 12:26:46 +0100
Subject: [PATCH] src/, regress/: Prepare for early failures in PTR queries.

Soon we're going to change the way adns_r_ptr queries work: in
particular, queries with names which can't be parsed back into addresses
will be rejected during submission rather than waiting for the answer to
the initial PTR question to come back.

So here we apply a really simple temporary hack to adns_submit which
approximately captures the behaviour we're after, and adjust the various
test cases to match.  We'll take this hack out when we make the proper
change to the PTR handling.

Hopefully this will persuade reviewers that there's nothing up my
sleeves while I mess with the regression tests.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
---
 regress/case-abbrev.out          |   2 +-
 regress/case-abbrev.sys          |  21 +------
 regress/case-abbrevto.out        |   2 +-
 regress/case-abbrevto.sys        | 105 +++++--------------------------
 regress/case-norecurse3.out      |   2 +-
 regress/case-norecurse3.sys      |  38 ++---------
 regress/case-owner.out           |   2 +-
 regress/case-owner.sys           |  22 +------
 regress/case-ptrbaddom.out       |   2 +-
 regress/case-ptrbaddom.sys       |  19 +-----
 regress/case-rootqueryall-as.out |   4 +-
 regress/case-rootqueryall-as.sys |  28 ++-------
 regress/case-rootqueryall.out    |   4 +-
 regress/case-rootqueryall.sys    |  76 +++-------------------
 regress/case-tcpallfail.out      |   2 +-
 regress/case-tcpblock.out        |   2 +-
 regress/case-tcpblock.sys        |   7 +--
 regress/case-tcpblockbrk.out     |   2 +-
 regress/case-tcpblockbrk.sys     |   7 +--
 regress/case-tcpblockwr.out      |   6 +-
 regress/case-tcpblockwr.sys      |  57 +++--------------
 src/query.c                      |  13 ++++
 22 files changed, 79 insertions(+), 344 deletions(-)

diff --git a/regress/case-abbrev.out b/regress/case-abbrev.out
index 1f786ef..991b128 100644
--- a/regress/case-abbrev.out
+++ b/regress/case-abbrev.out
@@ -14,6 +14,7 @@ greenend.org.uk flags 0 type 65548 PTR(checked) submitted
 greenend.org.uk flags 0 type 65551 MX(+addr) submitted
 greenend.org.uk flags 0 type 131078 SOA(822) submitted
 greenend.org.uk flags 0 type 131089 RP(822) submitted
+greenend.org.uk flags 0 type PTR(checked) ownflags=a: querydomainwrong; nrrs=0; cname=$; owner=$; ttl=604800
 greenend.org.uk flags 0 type A(-) ownflags=a: nodata; nrrs=0; cname=$; owner=$; ttl=86400
 greenend.org.uk flags 0 type NS(raw) ownflags=a: ok; nrrs=2; cname=$; owner=$; ttl=86400
  ns1.relativity.greenend.org.uk
@@ -31,7 +32,6 @@ greenend.org.uk flags 0 type A(addr) ownflags=a: nodata; nrrs=0; cname=$; owner=
 greenend.org.uk flags 0 type NS(+addr) ownflags=a: ok; nrrs=2; cname=$; owner=$; ttl=86400
  ns0.relativity.greenend.org.uk ok 0 ok "OK" ( INET 172.18.45.6 )
  ns1.relativity.greenend.org.uk ok 0 ok "OK" ( INET 172.18.45.65 )
-greenend.org.uk flags 0 type PTR(checked) ownflags=a: nodata; nrrs=0; cname=$; owner=$; ttl=86400
 greenend.org.uk flags 0 type MX(+addr) ownflags=a: ok; nrrs=1; cname=$; owner=$; ttl=86400
  10 chiark.greenend.org.uk ok 0 ok "OK" ( INET 195.224.76.132 )
 greenend.org.uk flags 0 type SOA(822) ownflags=a: ok; nrrs=1; cname=$; owner=$; ttl=86400
diff --git a/regress/case-abbrev.sys b/regress/case-abbrev.sys
index ddaf8a8..fd1b69f 100644
--- a/regress/case-abbrev.sys
+++ b/regress/case-abbrev.sys
@@ -64,12 +64,7 @@ adnstest default
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000367
- sendto fd=4 addr=172.18.45.6:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000366
+ +0.000733
  sendto fd=4 addr=172.18.45.6:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -223,19 +218,7 @@ adnstest default
  +0.000638
  recvfrom fd=4 buflen=512
  recvfrom=EAGAIN
- +0.000268
- select max=5 rfds=[4] wfds=[] efds=[] to=1.948491
- select=1 rfds=[4] wfds=[] efds=[]
- +0.002741
- recvfrom fd=4 buflen=512
- recvfrom=OK addr=172.18.45.6:53
-     312a8580 00010000 00010000 08677265 656e656e 64036f72 6702756b 00000c00
-     01c00c00 06000100 01518000 2d026e73 06636869 61726bc0 0c0a686f 73746d61
-     73746572 c00c7727 41340000 70800000 1c200009 3a800001 5180.
- +0.000540
- recvfrom fd=4 buflen=512
- recvfrom=EAGAIN
- +0.000129
+ +0.003678
  select max=5 rfds=[4] wfds=[] efds=[] to=1.945447
  select=1 rfds=[4] wfds=[] efds=[]
  +0.005215
diff --git a/regress/case-abbrevto.out b/regress/case-abbrevto.out
index bfda79c..0bc268b 100644
--- a/regress/case-abbrevto.out
+++ b/regress/case-abbrevto.out
@@ -14,6 +14,7 @@ greenend.org.uk flags 0 type 65548 PTR(checked) submitted
 greenend.org.uk flags 0 type 65551 MX(+addr) submitted
 greenend.org.uk flags 0 type 131078 SOA(822) submitted
 greenend.org.uk flags 0 type 131089 RP(822) submitted
+greenend.org.uk flags 0 type PTR(checked) ownflags=a: querydomainwrong; nrrs=0; cname=$; owner=$; ttl=604800
 greenend.org.uk flags 0 type A(-) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770
 greenend.org.uk flags 0 type NS(raw) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770
 greenend.org.uk flags 0 type CNAME(-) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770
@@ -25,7 +26,6 @@ greenend.org.uk flags 0 type TXT(-) ownflags=a: timeout; nrrs=0; cname=$; owner=
 greenend.org.uk flags 0 type RP(raw) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770
 greenend.org.uk flags 0 type A(addr) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770
 greenend.org.uk flags 0 type NS(+addr) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770
-greenend.org.uk flags 0 type PTR(checked) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770
 greenend.org.uk flags 0 type MX(+addr) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770
 greenend.org.uk flags 0 type SOA(822) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770
 greenend.org.uk flags 0 type RP(822) ownflags=a: timeout; nrrs=0; cname=$; owner=$; ttl=604770
diff --git a/regress/case-abbrevto.sys b/regress/case-abbrevto.sys
index f61cd0a..4215075 100644
--- a/regress/case-abbrevto.sys
+++ b/regress/case-abbrevto.sys
@@ -64,12 +64,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000319
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000319
+ +0.000638
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -148,12 +143,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000293
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000272
+ +0.000565
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -232,12 +222,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000273
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000273
+ +0.000546
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -316,12 +301,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000275
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000276
+ +0.000551
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -397,12 +377,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000273
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000294
+ +0.000567
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -478,12 +453,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000274
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000274
+ +0.000548
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -559,12 +529,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000273
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000273
+ +0.000546
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -640,12 +605,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000274
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000273
+ +0.000547
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -721,12 +681,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000321
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000279
+ +0.000600
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -802,12 +757,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000274
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000273
+ +0.000547
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -883,12 +833,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000274
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000276
+ +0.000550
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -964,12 +909,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000274
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000274
+ +0.000548
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -1045,12 +985,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000294
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000274
+ +0.000568
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -1126,12 +1061,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000274
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000275
+ +0.000549
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
@@ -1207,12 +1137,7 @@ adnstest noserver
      31290100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000200
      01.
  sendto=33
- +0.000273
- sendto fd=4 addr=172.18.45.36:53
-     312a0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000c00
-     01.
- sendto=33
- +0.000272
+ +0.000545
  sendto fd=4 addr=172.18.45.36:53
      312b0100 00010000 00000000 08677265 656e656e 64036f72 6702756b 00000f00
      01.
diff --git a/regress/case-norecurse3.out b/regress/case-norecurse3.out
index f59ec8b..dfe31a2 100644
--- a/regress/case-norecurse3.out
+++ b/regress/case-norecurse3.out
@@ -14,11 +14,11 @@ adns debug: using nameserver 172.18.45.6
 2.203.156.195.in-addr.arpa1 flags 0 type 65551 MX(+addr) submitted
 2.203.156.195.in-addr.arpa1 flags 0 type 131078 SOA(822) submitted
 2.203.156.195.in-addr.arpa1 flags 0 type 131089 RP(822) submitted
+2.203.156.195.in-addr.arpa1 flags 0 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604800
 2.203.156.195.in-addr.arpa1 flags 0 type A(-): No such domain; nrrs=0; cname=$; owner=$; ttl=86400
 2.203.156.195.in-addr.arpa1 flags 0 type RP(822): No such domain; nrrs=0; cname=$; owner=$; ttl=86400
 2.203.156.195.in-addr.arpa1 flags 0 type SOA(822): No such domain; nrrs=0; cname=$; owner=$; ttl=86400
 2.203.156.195.in-addr.arpa1 flags 0 type MX(+addr): No such domain; nrrs=0; cname=$; owner=$; ttl=86400
-2.203.156.195.in-addr.arpa1 flags 0 type PTR(checked): No such domain; nrrs=0; cname=$; owner=$; ttl=86400
 2.203.156.195.in-addr.arpa1 flags 0 type NS(+addr): No such domain; nrrs=0; cname=$; owner=$; ttl=86400
 2.203.156.195.in-addr.arpa1 flags 0 type A(addr): No such domain; nrrs=0; cname=$; owner=$; ttl=86400
 2.203.156.195.in-addr.arpa1 flags 0 type RP(raw): No such domain; nrrs=0; cname=$; owner=$; ttl=86400
diff --git a/regress/case-norecurse3.sys b/regress/case-norecurse3.sys
index 8ecea65..84a19d8 100644
--- a/regress/case-norecurse3.sys
+++ b/regress/case-norecurse3.sys
@@ -97,12 +97,7 @@ adnstest default -0x16
  +0.001344
  recvfrom fd=4 buflen=512
  recvfrom=EAGAIN
- +0.000109
- sendto fd=4 addr=172.18.45.6:53
-     312a0100 00010000 00000000 01320332 30330331 35360331 39350769 6e2d6164
-     64720561 72706131 00000c00 01.
- sendto=45
- +0.001205
+ +0.001314
  recvfrom fd=4 buflen=512
  recvfrom=EAGAIN
  +0.000113
@@ -202,12 +197,7 @@ adnstest default -0x16
  +0.000829
  select max=5 rfds=[4] wfds=[] efds=[] to=0.000000
  select=0 rfds=[] wfds=[] efds=[]
- +0.000001
- sendto fd=4 addr=172.18.45.6:53
-     312a0100 00010000 00000000 01320332 30330331 35360331 39350769 6e2d6164
-     64720561 72706131 00000c00 01.
- sendto=45
- +0.000487
+ +0.000488
  sendto fd=4 addr=172.18.45.6:53
      312b0100 00010000 00000000 01320332 30330331 35360331 39350769 6e2d6164
      64720561 72706131 00000f00 01.
@@ -292,15 +282,10 @@ adnstest default -0x16
      31290100 00010000 00000000 01320332 30330331 35360331 39350769 6e2d6164
      64720561 72706131 00000200 01.
  sendto=45
- +0.000428
+ +0.000915
  select max=5 rfds=[4] wfds=[] efds=[] to=0.000268
  select=0 rfds=[] wfds=[] efds=[]
- +0.006792
- sendto fd=4 addr=172.18.45.6:53
-     312a0100 00010000 00000000 01320332 30330331 35360331 39350769 6e2d6164
-     64720561 72706131 00000c00 01.
- sendto=45
- +0.000445
+ +0.006750
  sendto fd=4 addr=172.18.45.6:53
      312b0100 00010000 00000000 01320332 30330331 35360331 39350769 6e2d6164
      64720561 72706131 00000f00 01.
@@ -370,20 +355,7 @@ adnstest default -0x16
  +0.000134
  select max=5 rfds=[4] wfds=[] efds=[] to=1.506025
  select=1 rfds=[4] wfds=[] efds=[]
- +0.039372
- recvfrom fd=4 buflen=512
- recvfrom=OK addr=172.18.45.6:53
-     312a8583 00010000 00010000 01320332 30330331 35360331 39350769 6e2d6164
-     64720561 72706131 00000c00 01000006 00010001 5180003e 01410c52 4f4f542d
-     53455256 45525303 4e455400 0a686f73 746d6173 74657208 696e7465 726e6963
-     c0477727 dd100000 07080000 03840009 3a800001 5180.
- +0.000507
- recvfrom fd=4 buflen=512
- recvfrom=EAGAIN
- +0.000132
- select max=5 rfds=[4] wfds=[] efds=[] to=1.466014
- select=1 rfds=[4] wfds=[] efds=[]
- +0.039305
+ +0.079316
  recvfrom fd=4 buflen=512
  recvfrom=OK addr=172.18.45.6:53
      31298583 00010000 00010000 01320332 30330331 35360331 39350769 6e2d6164
diff --git a/regress/case-owner.out b/regress/case-owner.out
index 9cb3358..2631740 100644
--- a/regress/case-owner.out
+++ b/regress/case-owner.out
@@ -14,6 +14,7 @@ chiark.greenend.org.uk flags 4 type 65548 PTR(checked) submitted
 chiark.greenend.org.uk flags 4 type 65551 MX(+addr) submitted
 chiark.greenend.org.uk flags 4 type 131078 SOA(822) submitted
 chiark.greenend.org.uk flags 4 type 131089 RP(822) submitted
+chiark.greenend.org.uk flags 4 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=chiark.greenend.org.uk; ttl=604800
 chiark.greenend.org.uk flags 4 type A(-): OK; nrrs=1; cname=$; owner=chiark.greenend.org.uk; ttl=86400
  195.224.76.132
 chiark.greenend.org.uk flags 4 type NS(raw): No such data; nrrs=0; cname=$; owner=chiark.greenend.org.uk; ttl=86400
@@ -28,7 +29,6 @@ chiark.greenend.org.uk flags 4 type RP(raw): No such data; nrrs=0; cname=$; owne
 chiark.greenend.org.uk flags 4 type A(addr): OK; nrrs=1; cname=$; owner=chiark.greenend.org.uk; ttl=86400
  INET 195.224.76.132
 chiark.greenend.org.uk flags 4 type NS(+addr): No such data; nrrs=0; cname=$; owner=chiark.greenend.org.uk; ttl=86400
-chiark.greenend.org.uk flags 4 type PTR(checked): No such data; nrrs=0; cname=$; owner=chiark.greenend.org.uk; ttl=86400
 chiark.greenend.org.uk flags 4 type MX(+addr): OK; nrrs=1; cname=$; owner=chiark.greenend.org.uk; ttl=86400
  5 permutation-city.greenend.org.uk ok 0 ok "OK" ( INET 195.224.76.134 )
 chiark.greenend.org.uk flags 4 type SOA(822): No such data; nrrs=0; cname=$; owner=chiark.greenend.org.uk; ttl=86400
diff --git a/regress/case-owner.sys b/regress/case-owner.sys
index f7f6341..17c71a3 100644
--- a/regress/case-owner.sys
+++ b/regress/case-owner.sys
@@ -64,12 +64,7 @@ adnstest default
      31290100 00010000 00000000 06636869 61726b08 67726565 6e656e64 036f7267
      02756b00 00020001.
  sendto=40
- +0.001206
- sendto fd=4 addr=172.18.45.6:53
-     312a0100 00010000 00000000 06636869 61726b08 67726565 6e656e64 036f7267
-     02756b00 000c0001.
- sendto=40
- +0.001199
+ +0.002405
  sendto fd=4 addr=172.18.45.6:53
      312b0100 00010000 00000000 06636869 61726b08 67726565 6e656e64 036f7267
      02756b00 000f0001.
@@ -225,20 +220,7 @@ adnstest default
  +0.000776
  recvfrom fd=4 buflen=512
  recvfrom=EAGAIN
- +0.000435
- select max=5 rfds=[4] wfds=[] efds=[] to=1.955979
- select=1 rfds=[4] wfds=[] efds=[]
- +0.002598
- recvfrom fd=4 buflen=512
- recvfrom=OK addr=172.18.45.6:53
-     312a8580 00010000 00010000 06636869 61726b08 67726565 6e656e64 036f7267
-     02756b00 000c0001 08677265 656e656e 64036f72 6702756b 00000600 01000151
-     80002602 6e73c00c 0a686f73 746d6173 746572c0 2877276a 9c000070 8000001c
-     2000093a 80000151 80.
- +0.000777
- recvfrom fd=4 buflen=512
- recvfrom=EAGAIN
- +0.000396
+ +0.004206
  select max=5 rfds=[4] wfds=[] efds=[] to=1.953407
  select=1 rfds=[4] wfds=[] efds=[]
  +0.004872
diff --git a/regress/case-ptrbaddom.out b/regress/case-ptrbaddom.out
index 3be9371..93a353a 100644
--- a/regress/case-ptrbaddom.out
+++ b/regress/case-ptrbaddom.out
@@ -1,7 +1,7 @@
 adns debug: using nameserver 172.18.45.6
 37.45.18.172.in-addr.arpa.test.iwj.relativity.greenend.org.uk. flags 0 type 12 PTR(raw) submitted
 37.45.18.172.in-addr.arpa.test.iwj.relativity.greenend.org.uk. flags 0 type 65548 PTR(checked) submitted
+37.45.18.172.in-addr.arpa.test.iwj.relativity.greenend.org.uk. flags 0 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604800
 37.45.18.172.in-addr.arpa.test.iwj.relativity.greenend.org.uk. flags 0 type PTR(raw): OK; nrrs=1; cname=$; owner=$; ttl=60
  ptr.test.iwj.relativity.greenend.org.uk
-37.45.18.172.in-addr.arpa.test.iwj.relativity.greenend.org.uk. flags 0 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=60
 rc=0
diff --git a/regress/case-ptrbaddom.sys b/regress/case-ptrbaddom.sys
index 8a4a7d0..37b682f 100644
--- a/regress/case-ptrbaddom.sys
+++ b/regress/case-ptrbaddom.sys
@@ -15,13 +15,7 @@ adnstest default
      72046172 70610474 65737403 69776a0a 72656c61 74697669 74790867 7265656e
      656e6403 6f726702 756b0000 0c0001.
  sendto=79
- +0.001355
- sendto fd=4 addr=172.18.45.6:53
-     31200100 00010000 00000000 02333702 34350231 38033137 3207696e 2d616464
-     72046172 70610474 65737403 69776a0a 72656c61 74697669 74790867 7265656e
-     656e6403 6f726702 756b0000 0c0001.
- sendto=79
- +0.000776
+ +0.002131
  select max=5 rfds=[4] wfds=[] efds=[] to=1.997869
  select=1 rfds=[4] wfds=[] efds=[]
  +0.000258
@@ -33,16 +27,7 @@ adnstest default
      74657374 0369776a 0a72656c 61746976 69747908 67726565 6e656e64 036f7267
      02756b00 c05f0002 00010000 003c0006 036e7330 c068c090 00010001 00015180
      0004ac12 2d06.
- +0.000613
- recvfrom fd=4 buflen=512
- recvfrom=OK addr=172.18.45.6:53
-     31208580 00010001 00010001 02333702 34350231 38033137 3207696e 2d616464
-     72046172 70610474 65737403 69776a0a 72656c61 74697669 74790867 7265656e
-     656e6403 6f726702 756b0000 0c0001c0 0c000c00 01000000 3c002903 70747204
-     74657374 0369776a 0a72656c 61746976 69747908 67726565 6e656e64 036f7267
-     02756b00 c05f0002 00010000 003c0006 036e7330 c068c090 00010001 00015180
-     0004ac12 2d06.
- +0.000711
+ +0.001324
  recvfrom fd=4 buflen=512
  recvfrom=EAGAIN
  +0.000133
diff --git a/regress/case-rootqueryall-as.out b/regress/case-rootqueryall-as.out
index dcfbc8e..2af207a 100644
--- a/regress/case-rootqueryall-as.out
+++ b/regress/case-rootqueryall-as.out
@@ -29,6 +29,8 @@ adns debug: using nameserver 172.18.45.6
 . flags 1 type 65551 MX(+addr) submitted
 . flags 1 type 131078 SOA(822) submitted
 . flags 1 type 131089 RP(822) submitted
+. flags 0 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604800
+. flags 1 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604800
 . flags 0 type A(-): No such data; nrrs=0; cname=$; owner=$; ttl=599
 . flags 0 type NS(raw): OK; nrrs=13; cname=$; owner=$; ttl=518399
  E.ROOT-SERVERS.NET
@@ -66,7 +68,6 @@ adns debug: using nameserver 172.18.45.6
  C.ROOT-SERVERS.NET ok 0 ok "OK" ( INET 192.33.4.12 )
  D.ROOT-SERVERS.NET ok 0 ok "OK" ( INET 128.8.10.90 )
  E.ROOT-SERVERS.NET ok 0 ok "OK" ( INET 192.203.230.10 )
-. flags 0 type PTR(checked): No such data; nrrs=0; cname=$; owner=$; ttl=599
 . flags 0 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=599
 . flags 0 type SOA(822): OK; nrrs=1; cname=$; owner=$; ttl=77975
  A.ROOT-SERVERS.NET hostmaster@INTERNIC.NET 1999071300 1800 900 604800 86400
@@ -108,7 +109,6 @@ adns debug: using nameserver 172.18.45.6
  E.ROOT-SERVERS.NET ok 0 ok "OK" ( INET 192.203.230.10 )
  I.ROOT-SERVERS.NET ok 0 ok "OK" ( INET 192.36.148.17 )
  F.ROOT-SERVERS.NET ok 0 ok "OK" ( INET 192.5.5.241 )
-. flags 1 type PTR(checked): No such data; nrrs=0; cname=$; owner=$; ttl=599
 . flags 1 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=599
 . flags 1 type SOA(822): OK; nrrs=1; cname=$; owner=$; ttl=70372
  A.ROOT-SERVERS.NET hostmaster@INTERNIC.NET 1999071300 1800 900 604800 86400
diff --git a/regress/case-rootqueryall-as.sys b/regress/case-rootqueryall-as.sys
index 79d5f02..c2fb971 100644
--- a/regress/case-rootqueryall-as.sys
+++ b/regress/case-rootqueryall-as.sys
@@ -53,11 +53,7 @@ adnstest default
  sendto fd=4 addr=172.18.45.6:53
      31290100 00010000 00000000 00000200 01.
  sendto=17
- +0.000318
- sendto fd=4 addr=172.18.45.6:53
-     312a0100 00010000 00000000 00000c00 01.
- sendto=17
- +0.000299
+ +0.000617
  sendto fd=4 addr=172.18.45.6:53
      312b0100 00010000 00000000 00000f00 01.
  sendto=17
@@ -113,11 +109,7 @@ adnstest default
  sendto fd=4 addr=172.18.45.6:53
      31380100 00010000 00000000 00000200 01.
  sendto=17
- +0.000298
- sendto fd=4 addr=172.18.45.6:53
-     31390100 00010000 00000000 00000c00 01.
- sendto=17
- +0.000297
+ +0.000595
  sendto fd=4 addr=172.18.45.6:53
      313a0100 00010000 00000000 00000f00 01.
  sendto=17
@@ -281,13 +273,7 @@ adnstest default
      c6290004 c0a40001 00010009 3a7f0004 803f0235 c0b30001 00010009 3a7f0004
      8009006b c0c20001 00010009 3a7f0004 c021040c c0d10001 00010009 3a7f0004
      80080a5a c0e00001 00010009 3a7f0004 c0cbe60a.
- +0.002666
- recvfrom fd=4 buflen=512
- recvfrom=OK addr=172.18.45.6:53
-     312a8180 00010000 00010000 00000c00 01000006 00010000 0257003e 01410c52
-     4f4f542d 53455256 45525303 4e455400 0a686f73 746d6173 74657208 494e5445
-     524e4943 c02b7727 68440000 07080000 03840009 3a800001 5180.
- +0.001684
+ +0.004350
  recvfrom fd=4 buflen=512
  recvfrom=EAGAIN
  +0.000096
@@ -491,13 +477,7 @@ adnstest default
      8009006b c0a40001 00010009 3a7f0004 c021040c c0b30001 00010009 3a7f0004
      80080a5a c0c20001 00010009 3a7f0004 c0cbe60a c0d10001 00010009 3a7f0004
      c0249411 c0e00001 00010009 3a7f0004 c00505f1.
- +0.002663
- recvfrom fd=4 buflen=512
- recvfrom=OK addr=172.18.45.6:53
-     31398180 00010000 00010000 00000c00 01000006 00010000 0257003e 01410c52
-     4f4f542d 53455256 45525303 4e455400 0a686f73 746d6173 74657208 494e5445
-     524e4943 c02b7727 68440000 07080000 03840009 3a800001 5180.
- +0.001663
+ +0.004326
  recvfrom fd=4 buflen=512
  recvfrom=EAGAIN
  +0.000127
diff --git a/regress/case-rootqueryall.out b/regress/case-rootqueryall.out
index fed0a88..5fddca8 100644
--- a/regress/case-rootqueryall.out
+++ b/regress/case-rootqueryall.out
@@ -71,7 +71,7 @@ adns debug: reply not found, id 312e, query owner  (NS=172.18.45.6)
  C.ROOT-SERVERS.NET ok 0 ok "OK" ( INET 192.33.4.12 )
  D.ROOT-SERVERS.NET ok 0 ok "OK" ( INET 128.8.10.90 )
  E.ROOT-SERVERS.NET ok 0 ok "OK" ( INET 192.203.230.10 )
-. flags 0 type PTR(checked): No such data; nrrs=0; cname=$; owner=$; ttl=599
+. flags 0 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604793
 . flags 0 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=86400
 . flags 0 type SOA(822): OK; nrrs=1; cname=$; owner=$; ttl=51616
  A.ROOT-SERVERS.NET hostmaster@INTERNIC.NET 1999041600 1800 900 604800 86400
@@ -119,7 +119,7 @@ adns debug: reply not found, id 3139, query owner  (NS=172.18.45.6)
  E.ROOT-SERVERS.NET ok 0 ok "OK" ( INET 192.203.230.10 )
  I.ROOT-SERVERS.NET ok 0 ok "OK" ( INET 192.36.148.17 )
  F.ROOT-SERVERS.NET ok 0 ok "OK" ( INET 192.5.5.241 )
-. flags 1 type PTR(checked): No such data; nrrs=0; cname=$; owner=$; ttl=598
+. flags 1 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604792
 . flags 1 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=598
 . flags 1 type SOA(822): OK; nrrs=1; cname=$; owner=$; ttl=46580
  A.ROOT-SERVERS.NET hostmaster@INTERNIC.NET 1999041600 1800 900 604800 86400
diff --git a/regress/case-rootqueryall.sys b/regress/case-rootqueryall.sys
index 6d6c2b1..bb0515c 100644
--- a/regress/case-rootqueryall.sys
+++ b/regress/case-rootqueryall.sys
@@ -53,11 +53,7 @@ adnstest default -,s
  sendto fd=4 addr=172.18.45.6:53
      31290100 00010000 00000000 00000200 01.
  sendto=17
- +0.000727
- sendto fd=4 addr=172.18.45.6:53
-     312a0100 00010000 00000000 00000c00 01.
- sendto=17
- +0.000727
+ +0.001454
  sendto fd=4 addr=172.18.45.6:53
      312b0100 00010000 00000000 00000f00 01.
  sendto=17
@@ -113,11 +109,7 @@ adnstest default -,s
  sendto fd=4 addr=172.18.45.6:53
      31380100 00010000 00000000 00000200 01.
  sendto=17
- +0.000732
- sendto fd=4 addr=172.18.45.6:53
-     31390100 00010000 00000000 00000c00 01.
- sendto=17
- +0.000733
+ +0.001465
  sendto fd=4 addr=172.18.45.6:53
      313a0100 00010000 00000000 00000f00 01.
  sendto=17
@@ -356,11 +348,7 @@ adnstest default -,s
  sendto fd=4 addr=172.18.45.6:53
      31280100 00010000 00000000 00000100 01.
  sendto=17
- +0.000679
- sendto fd=4 addr=172.18.45.6:53
-     312a0100 00010000 00000000 00000c00 01.
- sendto=17
- +0.000685
+ +0.001364
  sendto fd=4 addr=172.18.45.6:53
      312b0100 00010000 00000000 00000f00 01.
  sendto=17
@@ -403,11 +391,7 @@ adnstest default -,s
  sendto fd=4 addr=172.18.45.6:53
      31370100 00010000 00000000 00000100 01.
  sendto=17
- +0.000682
- sendto fd=4 addr=172.18.45.6:53
-     31390100 00010000 00000000 00000c00 01.
- sendto=17
- +0.000684
+ +0.001366
  sendto fd=4 addr=172.18.45.6:53
      313a0100 00010000 00000000 00000f00 01.
  sendto=17
@@ -450,11 +434,7 @@ adnstest default -,s
  sendto fd=4 addr=172.18.45.6:53
      31280100 00010000 00000000 00000100 01.
  sendto=17
- +0.000683
- sendto fd=4 addr=172.18.45.6:53
-     312a0100 00010000 00000000 00000c00 01.
- sendto=17
- +0.000687
+ +0.001370
  sendto fd=4 addr=172.18.45.6:53
      312b0100 00010000 00000000 00000f00 01.
  sendto=17
@@ -497,11 +477,7 @@ adnstest default -,s
  sendto fd=4 addr=172.18.45.6:53
      31370100 00010000 00000000 00000100 01.
  sendto=17
- +0.000679
- sendto fd=4 addr=172.18.45.6:53
-     31390100 00010000 00000000 00000c00 01.
- sendto=17
- +0.000708
+ +0.001387
  sendto fd=4 addr=172.18.45.6:53
      313a0100 00010000 00000000 00000f00 01.
  sendto=17
@@ -544,11 +520,7 @@ adnstest default -,s
  sendto fd=4 addr=172.18.45.6:53
      31280100 00010000 00000000 00000100 01.
  sendto=17
- +0.000714
- sendto fd=4 addr=172.18.45.6:53
-     312a0100 00010000 00000000 00000c00 01.
- sendto=17
- +0.000683
+ +0.001397
  sendto fd=4 addr=172.18.45.6:53
      312b0100 00010000 00000000 00000f00 01.
  sendto=17
@@ -591,11 +563,7 @@ adnstest default -,s
  sendto fd=4 addr=172.18.45.6:53
      31370100 00010000 00000000 00000100 01.
  sendto=17
- +0.000680
- sendto fd=4 addr=172.18.45.6:53
-     31390100 00010000 00000000 00000c00 01.
- sendto=17
- +0.000681
+ +0.001361
  sendto fd=4 addr=172.18.45.6:53
      313a0100 00010000 00000000 00000f00 01.
  sendto=17
@@ -630,19 +598,7 @@ adnstest default -,s
  +0.000126
  select max=5 rfds=[4] wfds=[] efds=[] to=1.955756
  select=1 rfds=[4] wfds=[] efds=[]
- +0.002329
- recvfrom fd=4 buflen=512
- recvfrom=OK addr=172.18.45.6:53
-     312a8180 00010000 00010000 00000c00 01000006 00010000 0258003e 01410c52
-     4f4f542d 53455256 45525303 4e455400 0a686f73 746d6173 74657208 494e5445
-     524e4943 c02b7726 f4400000 07080000 03840009 3a800001 5180.
- +0.000570
- recvfrom fd=4 buflen=512
- recvfrom=EAGAIN
- +0.000117
- select max=5 rfds=[4] wfds=[] efds=[] to=1.952740
- select=1 rfds=[4] wfds=[] efds=[]
- +0.020912
+ +0.023928
  recvfrom fd=4 buflen=512
  recvfrom=OK addr=172.18.45.6:53
      312e8180 00010000 00010000 00000100 01000006 00010000 0258003e 01410c52
@@ -687,19 +643,7 @@ adnstest default -,s
  +0.000570
  recvfrom fd=4 buflen=512
  recvfrom=EAGAIN
- +0.000121
- select max=5 rfds=[4] wfds=[] efds=[] to=1.896832
- select=1 rfds=[4] wfds=[] efds=[]
- +0.002571
- recvfrom fd=4 buflen=512
- recvfrom=OK addr=172.18.45.6:53
-     31398180 00010000 00010000 00000c00 01000006 00010000 0258003e 01410c52
-     4f4f542d 53455256 45525303 4e455400 0a686f73 746d6173 74657208 494e5445
-     524e4943 c02b7726 f4400000 07080000 03840009 3a800001 5180.
- +0.002011
- recvfrom fd=4 buflen=512
- recvfrom=EAGAIN
- +0.000202
+ +0.004905
  select max=5 rfds=[4] wfds=[] efds=[] to=1.892048
  select=1 rfds=[4] wfds=[] efds=[]
  +0.002074
diff --git a/regress/case-tcpallfail.out b/regress/case-tcpallfail.out
index 1294f3b..799b0b5 100644
--- a/regress/case-tcpallfail.out
+++ b/regress/case-tcpallfail.out
@@ -14,6 +14,7 @@ test.iwj.relativity.greenend.org.uk. flags 2 type 65548 PTR(checked) submitted
 test.iwj.relativity.greenend.org.uk. flags 2 type 65551 MX(+addr) submitted
 test.iwj.relativity.greenend.org.uk. flags 2 type 131078 SOA(822) submitted
 test.iwj.relativity.greenend.org.uk. flags 2 type 131089 RP(822) submitted
+test.iwj.relativity.greenend.org.uk. flags 2 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604800
 adns warning: TCP connection failed: connect/read: Connection refused (NS=172.18.45.2)
 adns warning: TCP connection failed: connect/read: Connection refused (NS=172.18.45.2)
 test.iwj.relativity.greenend.org.uk. flags 2 type A(-): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800
@@ -27,7 +28,6 @@ test.iwj.relativity.greenend.org.uk. flags 2 type TXT(-): All nameservers failed
 test.iwj.relativity.greenend.org.uk. flags 2 type RP(raw): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800
 test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800
 test.iwj.relativity.greenend.org.uk. flags 2 type NS(+addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800
-test.iwj.relativity.greenend.org.uk. flags 2 type PTR(checked): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800
 test.iwj.relativity.greenend.org.uk. flags 2 type MX(+addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800
 test.iwj.relativity.greenend.org.uk. flags 2 type SOA(822): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800
 test.iwj.relativity.greenend.org.uk. flags 2 type RP(822): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604800
diff --git a/regress/case-tcpblock.out b/regress/case-tcpblock.out
index 41f8854..dc628d3 100644
--- a/regress/case-tcpblock.out
+++ b/regress/case-tcpblock.out
@@ -14,6 +14,7 @@ test.iwj.relativity.greenend.org.uk. flags 2 type 65548 PTR(checked) submitted
 test.iwj.relativity.greenend.org.uk. flags 2 type 65551 MX(+addr) submitted
 test.iwj.relativity.greenend.org.uk. flags 2 type 131078 SOA(822) submitted
 test.iwj.relativity.greenend.org.uk. flags 2 type 131089 RP(822) submitted
+test.iwj.relativity.greenend.org.uk. flags 2 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604800
 adns debug: TCP connected (NS=172.18.45.2)
 test.iwj.relativity.greenend.org.uk. flags 2 type A(-): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770
 test.iwj.relativity.greenend.org.uk. flags 2 type NS(raw): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770
@@ -26,7 +27,6 @@ test.iwj.relativity.greenend.org.uk. flags 2 type TXT(-): DNS query timed out; n
 test.iwj.relativity.greenend.org.uk. flags 2 type RP(raw): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770
 test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770
 test.iwj.relativity.greenend.org.uk. flags 2 type NS(+addr): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770
-test.iwj.relativity.greenend.org.uk. flags 2 type PTR(checked): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770
 test.iwj.relativity.greenend.org.uk. flags 2 type MX(+addr): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770
 test.iwj.relativity.greenend.org.uk. flags 2 type SOA(822): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770
 test.iwj.relativity.greenend.org.uk. flags 2 type RP(822): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770
diff --git a/regress/case-tcpblock.sys b/regress/case-tcpblock.sys
index 1257e1e..0557d39 100644
--- a/regress/case-tcpblock.sys
+++ b/regress/case-tcpblock.sys
@@ -82,12 +82,7 @@ adnstest anarres
      00353129 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
      74790867 7265656e 656e6403 6f726702 756b0000 020001.
  write=55
- +0.000212
- write fd=5
-     0035312a 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
-     74790867 7265656e 656e6403 6f726702 756b0000 0c0001.
- write=55
- +0.000213
+ +0.000425
  write fd=5
      0035312b 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
      74790867 7265656e 656e6403 6f726702 756b0000 0f0001.
diff --git a/regress/case-tcpblockbrk.out b/regress/case-tcpblockbrk.out
index 31f0488..4b7e9bc 100644
--- a/regress/case-tcpblockbrk.out
+++ b/regress/case-tcpblockbrk.out
@@ -14,6 +14,7 @@ test.iwj.relativity.greenend.org.uk. flags 2 type 65548 PTR(checked) submitted
 test.iwj.relativity.greenend.org.uk. flags 2 type 65551 MX(+addr) submitted
 test.iwj.relativity.greenend.org.uk. flags 2 type 131078 SOA(822) submitted
 test.iwj.relativity.greenend.org.uk. flags 2 type 131089 RP(822) submitted
+test.iwj.relativity.greenend.org.uk. flags 2 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604800
 adns debug: TCP connected (NS=172.18.45.2)
 adns warning: TCP connection failed: read: Connection reset by peer (NS=172.18.45.2)
 adns warning: TCP connection failed: connect/read: Connection refused (NS=172.18.45.2)
@@ -28,7 +29,6 @@ test.iwj.relativity.greenend.org.uk. flags 2 type TXT(-): All nameservers failed
 test.iwj.relativity.greenend.org.uk. flags 2 type RP(raw): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798
 test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798
 test.iwj.relativity.greenend.org.uk. flags 2 type NS(+addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798
-test.iwj.relativity.greenend.org.uk. flags 2 type PTR(checked): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798
 test.iwj.relativity.greenend.org.uk. flags 2 type MX(+addr): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798
 test.iwj.relativity.greenend.org.uk. flags 2 type SOA(822): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798
 test.iwj.relativity.greenend.org.uk. flags 2 type RP(822): All nameservers failed; nrrs=0; cname=$; owner=$; ttl=604798
diff --git a/regress/case-tcpblockbrk.sys b/regress/case-tcpblockbrk.sys
index b4f5171..40bf178 100644
--- a/regress/case-tcpblockbrk.sys
+++ b/regress/case-tcpblockbrk.sys
@@ -82,12 +82,7 @@ adnstest anarres -0x300
      00353129 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
      74790867 7265656e 656e6403 6f726702 756b0000 020001.
  write=55
- +0.001231
- write fd=6
-     0035312a 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
-     74790867 7265656e 656e6403 6f726702 756b0000 0c0001.
- write=55
- +0.001214
+ +0.002445
  write fd=6
      0035312b 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
      74790867 7265656e 656e6403 6f726702 756b0000 0f0001.
diff --git a/regress/case-tcpblockwr.out b/regress/case-tcpblockwr.out
index fa0e89a..4b84e30 100644
--- a/regress/case-tcpblockwr.out
+++ b/regress/case-tcpblockwr.out
@@ -44,6 +44,9 @@ test.iwj.relativity.greenend.org.uk. flags 2 type 65548 PTR(checked) submitted
 test.iwj.relativity.greenend.org.uk. flags 2 type 65551 MX(+addr) submitted
 test.iwj.relativity.greenend.org.uk. flags 2 type 131078 SOA(822) submitted
 test.iwj.relativity.greenend.org.uk. flags 2 type 131089 RP(822) submitted
+test.iwj.relativity.greenend.org.uk. flags 2 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604800
+test.iwj.relativity.greenend.org.uk. flags 2 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604800
+test.iwj.relativity.greenend.org.uk. flags 2 type PTR(checked): Domain invalid for particular DNS query type; nrrs=0; cname=$; owner=$; ttl=604800
 adns debug: TCP connected (NS=172.18.45.2)
 test.iwj.relativity.greenend.org.uk. flags 2 type A(-): No such data; nrrs=0; cname=$; owner=$; ttl=59
 test.iwj.relativity.greenend.org.uk. flags 2 type NS(raw): OK; nrrs=1; cname=$; owner=$; ttl=59
@@ -59,7 +62,6 @@ test.iwj.relativity.greenend.org.uk. flags 2 type RP(raw): No such data; nrrs=0;
 test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=59
 test.iwj.relativity.greenend.org.uk. flags 2 type NS(+addr): OK; nrrs=1; cname=$; owner=$; ttl=59
  ns0.relativity.greenend.org.uk ok 0 ok "OK" ( INET 172.18.45.6 )
-test.iwj.relativity.greenend.org.uk. flags 2 type PTR(checked): No such data; nrrs=0; cname=$; owner=$; ttl=59
 test.iwj.relativity.greenend.org.uk. flags 2 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=59
 test.iwj.relativity.greenend.org.uk. flags 2 type SOA(822): OK; nrrs=1; cname=$; owner=$; ttl=59
  ns0.relativity.greenend.org.uk hostmaster@relativity.greenend.org.uk 42 3600 120 6604800 60
@@ -78,7 +80,6 @@ test.iwj.relativity.greenend.org.uk. flags 2 type RP(raw): No such data; nrrs=0;
 test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=59
 test.iwj.relativity.greenend.org.uk. flags 2 type NS(+addr): OK; nrrs=1; cname=$; owner=$; ttl=59
  ns0.relativity.greenend.org.uk ok 0 ok "OK" ( INET 172.18.45.6 )
-test.iwj.relativity.greenend.org.uk. flags 2 type PTR(checked): No such data; nrrs=0; cname=$; owner=$; ttl=59
 test.iwj.relativity.greenend.org.uk. flags 2 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=59
 test.iwj.relativity.greenend.org.uk. flags 2 type SOA(822): OK; nrrs=1; cname=$; owner=$; ttl=59
  ns0.relativity.greenend.org.uk hostmaster@relativity.greenend.org.uk 42 3600 120 6604800 60
@@ -97,7 +98,6 @@ test.iwj.relativity.greenend.org.uk. flags 2 type RP(raw): No such data; nrrs=0;
 test.iwj.relativity.greenend.org.uk. flags 2 type A(addr): No such data; nrrs=0; cname=$; owner=$; ttl=59
 test.iwj.relativity.greenend.org.uk. flags 2 type NS(+addr): OK; nrrs=1; cname=$; owner=$; ttl=59
  ns0.relativity.greenend.org.uk ok 0 ok "OK" ( INET 172.18.45.6 )
-test.iwj.relativity.greenend.org.uk. flags 2 type PTR(checked): No such data; nrrs=0; cname=$; owner=$; ttl=59
 test.iwj.relativity.greenend.org.uk. flags 2 type MX(+addr): No such data; nrrs=0; cname=$; owner=$; ttl=59
 test.iwj.relativity.greenend.org.uk. flags 2 type SOA(822): OK; nrrs=1; cname=$; owner=$; ttl=59
  ns0.relativity.greenend.org.uk hostmaster@relativity.greenend.org.uk 42 3600 120 6604800 60
diff --git a/regress/case-tcpblockwr.sys b/regress/case-tcpblockwr.sys
index 81864aa..0fa81f8 100644
--- a/regress/case-tcpblockwr.sys
+++ b/regress/case-tcpblockwr.sys
@@ -82,12 +82,7 @@ adnstest anarres -0x300
      00353129 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
      74790867 7265656e 656e6403 6f726702 756b0000 020001.
  write=55
- +0.001192
- write fd=6
-     0035312a 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
-     74790867 7265656e 656e6403 6f726702 756b0000 0c0001.
- write=55
- +0.001192
+ +0.002384
  write fd=6
      0035312b 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
      74790867 7265656e 656e6403 6f726702 756b0000 0f0001.
@@ -157,12 +152,7 @@ adnstest anarres -0x300
      00353138 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
      74790867 7265656e 656e6403 6f726702 756b0000 020001.
  write=55
- +0.001202
- write fd=6
-     00353139 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
-     74790867 7265656e 656e6403 6f726702 756b0000 0c0001.
- write=55
- +0.001201
+ +0.002403
  write fd=6
      0035313a 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
      74790867 7265656e 656e6403 6f726702 756b0000 0f0001.
@@ -232,12 +222,7 @@ adnstest anarres -0x300
      00353147 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
      74790867 7265656e 656e6403 6f726702 756b0000 020001.
  write=55
- +0.001278
- write fd=6
-     00353148 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
-     74790867 7265656e 656e6403 6f726702 756b0000 0c0001.
- write=55
- +0.001207
+ +0.002485
  write fd=6
      00353149 01000001 00000000 00000474 65737403 69776a0a 72656c61 74697669
      74790867 7265656e 656e6403 6f726702 756b0000 0f0001.
@@ -348,17 +333,9 @@ adnstest anarres -0x300
  read=OK
      76697479 08677265 656e656e 64036f72 6702756b 00000200 01c00c00 02000100
      00003c00 20036e73 300a7265 6c617469 76697479 08677265 656e656e 64036f72
-     6702756b 00c04100 01000100 01518000 04ac122d 06008231 2a858000 01000000
-     01000004 74657374 0369776a 0a72656c 61746976 69747908 67726565 6e656e64
-     036f7267.
- +0.001035
- read fd=6 buflen=115
- read=OK
-     02756b00 000c0001 c00c0006 00010000 003c0041 036e7330 0a72656c 61746976
-     69747908 67726565 6e656e64 036f7267 02756b00 0a686f73 746d6173 746572c0
-     45000000 2a00000e 10000000 780064c8 00000000 3c008231 2b858000 01000000
+     6702756b 00c04100 01000100 01518000 04ac122d 06008231 2b858000 01000000
      01000004 74657374 0369776a 0a72656c 617469.
- +0.000978
+ +0.002013
  read fd=6 buflen=132
  read=OK
      76697479 08677265 656e656e 64036f72 6702756b 00000f00 01c00c00 06000100
@@ -468,17 +445,9 @@ adnstest anarres -0x300
  read=OK
      76697479 08677265 656e656e 64036f72 6702756b 00000200 01c00c00 02000100
      00003c00 20036e73 300a7265 6c617469 76697479 08677265 656e656e 64036f72
-     6702756b 00c04100 01000100 01518000 04ac122d 06008231 39858000 01000000
-     01000004 74657374 0369776a 0a72656c 61746976 69747908 67726565 6e656e64
-     036f7267.
- +0.000931
- read fd=6 buflen=115
- read=OK
-     02756b00 000c0001 c00c0006 00010000 003c0041 036e7330 0a72656c 61746976
-     69747908 67726565 6e656e64 036f7267 02756b00 0a686f73 746d6173 746572c0
-     45000000 2a00000e 10000000 780064c8 00000000 3c008231 3a858000 01000000
+     6702756b 00c04100 01000100 01518000 04ac122d 06008231 3a858000 01000000
      01000004 74657374 0369776a 0a72656c 617469.
- +0.000978
+ +0.001909
  read fd=6 buflen=132
  read=OK
      76697479 08677265 656e656e 64036f72 6702756b 00000f00 01c00c00 06000100
@@ -588,17 +557,9 @@ adnstest anarres -0x300
  read=OK
      76697479 08677265 656e656e 64036f72 6702756b 00000200 01c00c00 02000100
      00003c00 20036e73 300a7265 6c617469 76697479 08677265 656e656e 64036f72
-     6702756b 00c04100 01000100 01518000 04ac122d 06008231 48858000 01000000
-     01000004 74657374 0369776a 0a72656c 61746976 69747908 67726565 6e656e64
-     036f7267.
- +0.000956
- read fd=6 buflen=115
- read=OK
-     02756b00 000c0001 c00c0006 00010000 003c0041 036e7330 0a72656c 61746976
-     69747908 67726565 6e656e64 036f7267 02756b00 0a686f73 746d6173 746572c0
-     45000000 2a00000e 10000000 780064c8 00000000 3c008231 49858000 01000000
+     6702756b 00c04100 01000100 01518000 04ac122d 06008231 49858000 01000000
      01000004 74657374 0369776a 0a72656c 617469.
- +0.001151
+ +0.002107
  read fd=6 buflen=132
  read=OK
      76697479 08677265 656e656e 64036f72 6702756b 00000f00 01c00c00 06000100
diff --git a/src/query.c b/src/query.c
index a3ce68d..dd2a47a 100644
--- a/src/query.c
+++ b/src/query.c
@@ -294,7 +294,17 @@ int adns_submit(adns_state ads,
     ol--;
   }
 
+/* temporary hack */
+#define CHECK_PTR do {							\
+  if (type == adns_r_ptr && (ol < 5 ||					\
+			     strncmp(owner + ol - 5, ".arpa", 5))) {	\
+    ads->nextid++; adns__autosys(ads,now);				\
+    stat= adns_s_querydomainwrong; goto x_adnsfail;			\
+  }									\
+} while (0)
+
   if (flags & adns_qf_search) {
+    CHECK_PTR;
     r= adns__vbuf_append(&qu->search_vb,owner,ol);
     if (!r) { stat= adns_s_nomemory; goto x_adnsfail; }
 
@@ -306,12 +316,15 @@ int adns_submit(adns_state ads,
     if (flags & adns_qf_owner) {
       if (!save_owner(qu,owner,ol)) { stat= adns_s_nomemory; goto x_adnsfail; }
     }
+    CHECK_PTR;
     query_simple(ads,qu, owner,ol, typei,flags, now);
   }
   adns__autosys(ads,now);
   adns__consistency(ads,qu,cc_entex);
   return 0;
 
+#undef CHECK_PTR
+
  x_adnsfail:
   adns__query_fail(qu,stat);
   adns__consistency(ads,qu,cc_entex);
-- 
2.30.2