964. [func] Warn if non root hints data is found in hints file.

diff --git a/CHANGES b/CHANGES
index 8c023b481e2ca581a8b75f4fbb346d2c0eaa7f6b..8abccd5de1fec411e5b4204d3fcafb927566f57d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ 964.  [func]          Warn if non root hints data is found in hints file.
+
  963.  [bug]           bad ISC_LANG_ENDDECLS. [RT #1645]
 
  962.  [bug]           libbind: bad "#undef", don't attempt to install

diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
index ba690be4c613dc2691f6eda1bbe2e152e640dfe2..6a0598657b8e13b9243887272f20b0678370aaca 100644 (file)
--- a/lib/dns/include/dns/log.h
+++ b/lib/dns/include/dns/log.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.29 2001/07/16 05:10:24 mayer Exp $ */
+/* $Id: log.h,v 1.30 2001/08/27 03:36:00 marka Exp $ */
 
 /* Principal Authors: DCL */
 
@@ -67,6 +67,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[];
 #define DNS_LOGMODULE_TKEY             (&dns_modules[21])
 #define DNS_LOGMODULE_SDB              (&dns_modules[22])
 #define DNS_LOGMODULE_DIFF             (&dns_modules[23])
+#define DNS_LOGMODULE_HINTS            (&dns_modules[24])
 
 ISC_LANG_BEGINDECLS
 

diff --git a/lib/dns/log.c b/lib/dns/log.c
index 63689f4ec5c15c39b764e882644c4ebf76a88a68..8b95316a6ade62ead08a963d61ff034664398b21 100644 (file)
--- a/lib/dns/log.c
+++ b/lib/dns/log.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.32 2001/07/16 05:10:21 mayer Exp $ */
+/* $Id: log.c,v 1.33 2001/08/27 03:35:58 marka Exp $ */
 
 /* Principal Authors: DCL */
 
@@ -72,6 +72,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = {
        { "dns/tkey",           0 },
        { "dns/sdb",            0 },
        { "dns/diff",           0 },
+       { "dns/hints",          0 },
        { NULL,                 0 }
 };
 

diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c
index 225b84893bfd3ddaecfd55c026b9c50f30d9e8a7..ee8d6c00fe35c99708577b4caf988f83c91af5f6 100644 (file)
--- a/lib/dns/rootns.c
+++ b/lib/dns/rootns.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rootns.c,v 1.18 2001/01/09 21:51:30 bwelling Exp $ */
+/* $Id: rootns.c,v 1.19 2001/08/27 03:35:57 marka Exp $ */
 
 #include <config.h>
 
@@ -25,7 +25,14 @@
 
 #include <dns/callbacks.h>
 #include <dns/db.h>
+#include <dns/dbiterator.h>
+#include <dns/log.h>
+#include <dns/fixedname.h>
 #include <dns/master.h>
+#include <dns/rdata.h>
+#include <dns/rdatasetiter.h>
+#include <dns/rdataset.h>
+#include <dns/rdatastruct.h>
 #include <dns/result.h>
 #include <dns/rootns.h>
 
@@ -63,6 +70,120 @@ static char root_ns[] =
 "L.ROOT-SERVERS.NET.     3600000 IN      A       198.32.64.12\n"
 "M.ROOT-SERVERS.NET.     3600000 IN      A       202.12.27.33\n";
 
+static isc_result_t
+in_rootns(dns_rdataset_t *rootns, dns_name_t *name) {
+       isc_result_t result;
+       dns_rdata_t rdata = DNS_RDATA_INIT;
+       dns_rdata_ns_t ns;
+       
+       result = dns_rdataset_first(rootns);
+       while (result == ISC_R_SUCCESS) {
+               dns_rdataset_current(rootns, &rdata);
+               result = dns_rdata_tostruct(&rdata, &ns, NULL);
+               if (result != ISC_R_SUCCESS)
+                       return (result);
+               if (dns_name_compare(name, &ns.name) == 0)
+                       return (ISC_R_SUCCESS);
+               result = dns_rdataset_next(rootns);
+       }
+       if (result == ISC_R_NOMORE)
+               result = ISC_R_NOTFOUND;
+       return (result);
+}
+
+static isc_result_t 
+check_node(dns_rdataset_t *rootns, dns_name_t *name,
+          dns_rdatasetiter_t *rdsiter) {
+       isc_result_t result;
+       dns_rdataset_t rdataset;
+
+       dns_rdataset_init(&rdataset);
+       result = dns_rdatasetiter_first(rdsiter);
+       while (result == ISC_R_SUCCESS) {
+               dns_rdatasetiter_current(rdsiter, &rdataset);
+               switch (rdataset.type) {
+               case dns_rdatatype_a:
+               case dns_rdatatype_aaaa:
+               case dns_rdatatype_a6:
+                       result = in_rootns(rootns, name);
+                       if (result != ISC_R_SUCCESS)
+                               goto cleanup;
+                       break;
+               case dns_rdatatype_ns:
+                       if (dns_name_compare(name, dns_rootname) == 0)
+                               break;
+                       /*FALLTHROUGH*/
+               default:
+                       result = ISC_R_FAILURE;
+                       goto cleanup;
+               }
+               dns_rdataset_disassociate(&rdataset);
+               result = dns_rdatasetiter_next(rdsiter);
+       }
+       if (result == ISC_R_NOMORE)
+               result = ISC_R_SUCCESS;
+ cleanup:
+       if (dns_rdataset_isassociated(&rdataset))
+               dns_rdataset_disassociate(&rdataset);
+       return (result);
+}
+
+static isc_result_t
+check_hints(dns_db_t *db) {
+       isc_result_t result;
+       dns_rdataset_t rootns;
+       dns_dbiterator_t *dbiter = NULL;
+       dns_dbnode_t *node = NULL;
+       isc_stdtime_t now;
+       dns_fixedname_t fixname;
+       dns_name_t *name;
+       dns_rdatasetiter_t *rdsiter = NULL;
+
+       isc_stdtime_get(&now);
+
+       dns_fixedname_init(&fixname);
+       name = dns_fixedname_name(&fixname);
+
+       dns_rdataset_init(&rootns);
+       result = dns_db_find(db, dns_rootname, NULL, dns_rdatatype_ns, 0,
+                            now, NULL, name, &rootns, NULL);
+       if (result != ISC_R_SUCCESS)
+               goto cleanup;
+       result = dns_db_createiterator(db, ISC_FALSE, &dbiter);
+       if (result != ISC_R_SUCCESS)
+               goto cleanup;
+       result = dns_dbiterator_first(dbiter);
+       if (result != ISC_R_SUCCESS)
+               goto cleanup;
+       while (result == ISC_R_SUCCESS) {
+               result = dns_dbiterator_current(dbiter, &node, name);
+               if (result != ISC_R_SUCCESS)
+                       goto cleanup;
+               result = dns_db_allrdatasets(db, node, NULL, now, &rdsiter);
+               if (result != ISC_R_SUCCESS)
+                       goto cleanup;
+               result = check_node(&rootns, name, rdsiter);
+               if (result != ISC_R_SUCCESS)
+                       goto cleanup;
+               dns_rdatasetiter_destroy(&rdsiter);
+               dns_db_detachnode(db, &node);
+               result = dns_dbiterator_next(dbiter);
+       }
+       if (result == ISC_R_NOMORE)
+               result = ISC_R_SUCCESS;
+
+ cleanup:
+       if (dns_rdataset_isassociated(&rootns))
+               dns_rdataset_disassociate(&rootns);
+       if (rdsiter != NULL)
+               dns_rdatasetiter_destroy(&rdsiter);
+       if (node != NULL)
+               dns_db_detachnode(db, &node);
+       if (dbiter != NULL)
+               dns_dbiterator_destroy(&dbiter);
+       return (result);
+}
+
 isc_result_t
 dns_rootns_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
                  const char *filename, dns_db_t **target)
@@ -111,7 +232,11 @@ dns_rootns_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
                result = eresult;
        if (result != ISC_R_SUCCESS && result != DNS_R_SEENINCLUDE)
                goto db_detach;
-
+       if (check_hints(db) != ISC_R_SUCCESS)
+               isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
+                             DNS_LOGMODULE_HINTS, ISC_LOG_WARNING,
+                             "extra data in root hints \"%s\"",
+                             (filename != NULL) ? filename : "<BUILT-IN>");
        *target = db;
        return (ISC_R_SUCCESS);