2455. [bug] Stop metadata being transfered via axfr/ixfr.

                        [RT #18639]

diff --git a/CHANGES b/CHANGES
index 62b7f19ac4192ae764724d02f0022f620b276545..0fba6235506b7cbdd1ccc3ce4869c834e3cb7137 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2455.  [bug]           Stop metadata being transfered via axfr/ixfr.
+                       [RT #18639]
+
 2454.  [func]          nsupdate: you can now set a default ttl. [RT #18317]
 
 2453.  [bug]           Remove NULL pointer dereference in dns_journal_print().

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 06b539981ccac8e2a3f6024ff0f7078ed2e507c6..140a3eefc1009e2c373d427cb6d227f2c6ab4bee 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.164 2008/08/15 17:52:53 jinmei Exp $ */
+/* $Id: xfrin.c,v 1.165 2008/09/25 03:49:55 marka Exp $ */
 
 /*! \file */
 
@@ -433,6 +433,9 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl,
 
        xfr->nrecs++;
 
+       if (rdata->type == 0 || dns_rdatatype_ismeta(rdata->type))
+               FAIL(DNS_R_FORMERR);
+
  redo:
        switch (xfr->state) {
        case XFRST_SOAQUERY: