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

                        [RT #18639]

diff --git a/CHANGES b/CHANGES
index 3378a1b9c12f884a1029f487350c1186d6dcdb6e..6ecb695a9860f798f78575302ca294fd29977120 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2455.  [bug]           Stop metadata being transfered via axfr/ixfr.
+                       [RT #18639]
+
 2453.  [bug]           Remove NULL pointer dereference in dns_journal_print().
                        [RT #18316]
 

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index c8f2f8b8c6b83fd99de0733ca3c58d2f03dae046..a7959fa3fa3be994b9e27dc03e6a5c26ec61898f 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.124.2.4.2.26 2008/07/28 23:45:48 tbox Exp $ */
+/* $Id: xfrin.c,v 1.124.2.4.2.27 2008/09/25 03:56:05 marka Exp $ */
 
 #include <config.h>
 
@@ -424,6 +424,9 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl,
 {
        isc_result_t result;
 
+       if (rdata->type == 0 || dns_rdatatype_ismeta(rdata->type))
+               FAIL(DNS_R_FORMERR);
+
  redo:
        switch (xfr->state) {
        case XFRST_SOAQUERY: