Bind non-zone: more carefull check + tests.

diff --git a/pdns/backends/bind/bindbackend2.cc b/pdns/backends/bind/bindbackend2.cc
index 26d5f6d57d4c1f213f2876e8c22c655d04fb0cd2..ec3c1a75d17bf9a889406729ff19bdc381deceae 100644 (file)
--- a/pdns/backends/bind/bindbackend2.cc
+++ b/pdns/backends/bind/bindbackend2.cc
@@ -415,6 +415,7 @@ void Bind2Backend::insert(shared_ptr<State> stage, int id, const string &qnameu,
 {
   BB2DomainInfo bb2 = stage->id_zone_map[id];
   Bind2DNSRecord bdr;
+  size_t p;
 
   recordstorage_t& records=*bb2.d_records; 
 

diff --git a/regression-tests/basic-nonzone/command b/regression-tests/basic-nonzone/command
new file mode 100755 (executable)
index 0000000..3f03a97
--- /dev/null
+++ b/regression-tests/basic-nonzone/command
@@ -0,0 +1,4 @@
+#!/bin/sh
+cleandig nonzone.com A
+cleandig testnonzone.com A
+

diff --git a/regression-tests/basic-nonzone/description b/regression-tests/basic-nonzone/description
new file mode 100644 (file)
index 0000000..51497ac
--- /dev/null
+++ b/regression-tests/basic-nonzone/description
@@ -0,0 +1,2 @@
+This test tries to resolve a straight A record that is directly available in
+the database.

diff --git a/regression-tests/basic-nonzone/expected_result b/regression-tests/basic-nonzone/expected_result
new file mode 100644 (file)
index 0000000..84ba943
--- /dev/null
+++ b/regression-tests/basic-nonzone/expected_result
@@ -0,0 +1,31 @@
+0      nonzone.com.    IN      A       3600    127.0.0.1
+Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='nonzone.com.', qtype=A
+1      .       IN      NS      518400  a.root-servers.net.
+1      .       IN      NS      518400  b.root-servers.net.
+1      .       IN      NS      518400  c.root-servers.net.
+1      .       IN      NS      518400  d.root-servers.net.
+1      .       IN      NS      518400  e.root-servers.net.
+1      .       IN      NS      518400  f.root-servers.net.
+1      .       IN      NS      518400  g.root-servers.net.
+1      .       IN      NS      518400  h.root-servers.net.
+1      .       IN      NS      518400  i.root-servers.net.
+1      .       IN      NS      518400  j.root-servers.net.
+1      .       IN      NS      518400  k.root-servers.net.
+1      .       IN      NS      518400  l.root-servers.net.
+1      .       IN      NS      518400  m.root-servers.net.
+2      a.root-servers.net.     IN      A       3600000 198.41.0.4
+2      b.root-servers.net.     IN      A       3600000 192.228.79.201
+2      c.root-servers.net.     IN      A       3600000 192.33.4.12
+2      d.root-servers.net.     IN      A       3600000 199.7.91.13
+2      e.root-servers.net.     IN      A       3600000 192.203.230.10
+2      f.root-servers.net.     IN      A       3600000 192.5.5.241
+2      g.root-servers.net.     IN      A       3600000 192.112.36.4
+2      h.root-servers.net.     IN      A       3600000 128.63.2.53
+2      i.root-servers.net.     IN      A       3600000 192.36.148.17
+2      j.root-servers.net.     IN      A       3600000 192.58.128.30
+2      k.root-servers.net.     IN      A       3600000 193.0.14.129
+2      l.root-servers.net.     IN      A       3600000 198.32.64.12
+2      m.root-servers.net.     IN      A       3600000 202.12.27.33
+Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
+Reply to question for qname='testnonzone.com.', qtype=A

diff --git a/regression-tests/named.conf b/regression-tests/named.conf
index b207c73e6654de3cb64c2e039cfeef886a05ff03..31cd619fae4a67897151bbe658ecc8f378cafed5 100644 (file)
--- a/regression-tests/named.conf
+++ b/regression-tests/named.conf
@@ -30,6 +30,11 @@ zone "wtest.com"{
        file "./wtest.com";
 };
 
+zone "nonzone.com"{
+       type master;
+       file "./nonzone.com";
+};
+
 
 zone "dnssec-parent.com"{
        type master;

diff --git a/regression-tests/nonzone.com b/regression-tests/nonzone.com
new file mode 100644 (file)
index 0000000..54459e3
--- /dev/null
+++ b/regression-tests/nonzone.com
@@ -0,0 +1,15 @@
+$TTL 3600
+$ORIGIN nonzone.com.
+@              IN      SOA     ns1.nonzone.com.        ahu.example.com. (  2005092501
+                       8H ; refresh
+                       2H ; retry
+                       1W ; expire
+                       1D ; default_ttl
+                       )
+
+@                      IN      NS      ns1
+@                      IN      NS      ns2
+@                      IN      MX      10      smtp-servers.example.com.
+@                      IN      MX      15      smtp-servers
+@                      IN      A       127.0.0.1
+testnonzone.com.         IN      A       127.100.100.100