2984. [bug] Don't run MX checks when the target of the MX record

                        is ".".  [RT #22645]

diff --git a/CHANGES b/CHANGES
index b34bf53c707fd64ab85230db13156cbc25daec41..61a66b74381daa4b4d6d3ce076c272be580f46b8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2984.  [bug]           Don't run MX checks when the target of the MX record
+                       is ".".  [RT #22645]
+
        --- 9.6.3b1 released ---
 
 2982.  [bug]           Reference count dst keys.  dst_key_attach() can be used

diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 746b43cdd6f6b81a616a0bbe4163bbb6fb020ace..b13b1e4b19891bb0f67c216d60ccadff5ce01ff1 100644 (file)
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.h,v 1.160.50.6 2009/10/05 21:57:00 each Exp $ */
+/* $Id: zone.h,v 1.160.50.7 2010/12/14 00:48:23 marka Exp $ */
 
 #ifndef DNS_ZONE_H
 #define DNS_ZONE_H 1
@@ -1654,7 +1654,7 @@ void
 dns_zone_setcheckmx(dns_zone_t *zone, dns_checkmxfunc_t checkmx);
 /*%<
  *     Set the post load integrity callback function 'checkmx'.
- *     'checkmx' will be called if the MX is not within the zone.
+ *     'checkmx' will be called if the MX TARGET is not within the zone.
  *
  * Require:
  *     'zone' to be a valid zone.
@@ -1673,8 +1673,8 @@ dns_zone_setchecksrv(dns_zone_t *zone, dns_checkmxfunc_t checksrv);
 void
 dns_zone_setcheckns(dns_zone_t *zone, dns_checknsfunc_t checkns);
 /*%<
- *     Set the post load integrity callback function 'checkmx'.
- *     'checkmx' will be called if the MX is not within the zone.
+ *     Set the post load integrity callback function 'checkns'.
+ *     'checkns' will be called if the NS TARGET is not within the zone.
  *
  * Require:
  *     'zone' to be a valid zone.

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index ef9aa16e595098ec34c4722cfb459f86e6d20a12..61cbf37a3549bd7c95219269432e90e8f05b8cca 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.483.36.22 2010/12/02 23:40:28 marka Exp $ */
+/* $Id: zone.c,v 1.483.36.23 2010/12/14 00:48:22 marka Exp $ */
 
 /*! \file */
 
@@ -1701,6 +1701,12 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
        dns_name_t *foundname;
        int level;
 
+       /*
+        * "." means the services does not exist.
+        */
+       if (dns_name_equal(name, dns_rootname))
+               return (ISC_TRUE);
+
        /*
         * Outside of zone.
         */