[master] copyrights, win32 definitions

diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h
index f051bfeca39a545cd39812b494239c9323e4c672..1e7123b9bc63df3ba688f61014421275dab6619e 100644 (file)
--- a/bin/named/include/named/config.h
+++ b/bin/named/include/named/config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/named/query.c b/bin/named/query.c
index b2a7650b63f57ee72e8af80ebdd457ddc4ea9919..88d14ad0812c798d23908ce6651a216dcb81435f 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -3301,7 +3301,7 @@ query_addbestns(ns_client_t *client) {
                query_putrdataset(client, &rdataset);
                if (sigrdataset != NULL)
                        query_putrdataset(client, &sigrdataset);
-               
+
                RESTORE(fname, zfname);
                RESTORE(rdataset, zrdataset);
                RESTORE(sigrdataset, zsigrdataset);

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 2d297a7c80c4f51cd1122251ef4bdbe0054c2c23..6e81c0835adc956f175ac31413db271089da9635 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/catz/clean.sh b/bin/tests/system/catz/clean.sh
index 4e4bdc4316f99cccbd1be73ad70944ee177a6c7c..bf1b2d5aa9e62ec532f7a884e6634d23969f098f 100644 (file)
--- a/bin/tests/system/catz/clean.sh
+++ b/bin/tests/system/catz/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/catz/ns1/catalog.example.db.in b/bin/tests/system/catz/ns1/catalog.example.db.in
index 53013fe837df30b4c367e93ff4a40d1b88cfff2e..2254d184742aeda1f270363829a54b359b5728d1 100644 (file)
--- a/bin/tests/system/catz/ns1/catalog.example.db.in
+++ b/bin/tests/system/catz/ns1/catalog.example.db.in
@@ -1,3 +1,17 @@
+; Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+;
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
+
 @ 3600 SOA . . 1 86400 3600 86400 3600
 @ 3600 IN NS invalid.
 version IN TXT "1"

diff --git a/bin/tests/system/catz/ns1/named.conf b/bin/tests/system/catz/ns1/named.conf
index db67cbfffa7b2d312f926158e0adc04a748a6290..e096977394f0f97f116f23161d69fd17623c2093 100644 (file)
--- a/bin/tests/system/catz/ns1/named.conf
+++ b/bin/tests/system/catz/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/catz/ns2/named.conf b/bin/tests/system/catz/ns2/named.conf
index 9df04aeee00a946a4972d9800ff595257081efbe..4cd508d78bd69116a124e9203448e76414ae5afe 100644 (file)
--- a/bin/tests/system/catz/ns2/named.conf
+++ b/bin/tests/system/catz/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/catz/ns3/dom4.example.db b/bin/tests/system/catz/ns3/dom4.example.db
index 4cbd501e07480d1f9a88f3e12d133df5de482c1b..2373dce3364992a079c127181af6a8c24dbfdbda 100644 (file)
--- a/bin/tests/system/catz/ns3/dom4.example.db
+++ b/bin/tests/system/catz/ns3/dom4.example.db
@@ -1,2 +1,16 @@
+; Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+;
+; Permission to use, copy, modify, and/or distribute this software for any
+; purpose with or without fee is hereby granted, provided that the above
+; copyright notice and this permission notice appear in all copies.
+;
+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+; PERFORMANCE OF THIS SOFTWARE.
+
 @ 3600 IN SOA . . 1 3600 3600 3600 3600
 @ IN NS invalid.

diff --git a/bin/tests/system/catz/ns3/named.conf b/bin/tests/system/catz/ns3/named.conf
index d4cb7954a40fa83ace1d3ab12a066bab2b666ddf..0b9e5b4e7ff6fbf17c1a2d9ac7f129e7ffd21f27 100644 (file)
--- a/bin/tests/system/catz/ns3/named.conf
+++ b/bin/tests/system/catz/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/catz/setup.sh b/bin/tests/system/catz/setup.sh
index ece0f4f9e6d33aa926526e8cc11452b11e28da7f..8e0d3e8d86b72d814f75e626b210ca51529f67fd 100644 (file)
--- a/bin/tests/system/catz/setup.sh
+++ b/bin/tests/system/catz/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh
index 77d54414b7a589d4085e74839c414b5df6ddbdfe..c72b99c69078e182f90a010bca6386dc929f31eb 100644 (file)
--- a/bin/tests/system/catz/tests.sh
+++ b/bin/tests/system/catz/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -x
 #
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/doc/arm/catz.xml b/doc/arm/catz.xml
index 9316ee8c6d03cb2a8f33d8e986028e0d064b7d11..edbea9c73d261d4c2459d9bc8e089ac8e755f6ee 100644 (file)
--- a/doc/arm/catz.xml
+++ b/doc/arm/catz.xml
@@ -13,6 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
+
 <section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="catz-info"><info><title>Catalog Zones</title></info>
 
   <para>
@@ -119,7 +120,7 @@ catalog-zones {
       be a slave zone.
     </para>
     <para>
-      The <option>default-masters</option> option defines the default masters 
+      The <option>default-masters</option> option defines the default masters
       for member zones listed in a catalog zone. This can be overriden by
       options within a catalog zone. If no such options are included, then
       member zones will transfer their contents from the servers listed in

diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 335d2f74da63ff5b8d9fe6d32a96fd0b92a016b7..95aae2ccda4051fbfe4efab9ab545f74a4c812dd 100644 (file)
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index d2d51395307d271c9b86d258c368025cb4918838..16450a245cbed0da902d93da36fef41c4d092770 100644 (file)
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011, 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index 4866a5a1b5f65fee2b411ff36b3d645eefc88ff3..f99fa56fbc5ed82a9db975641b9611e86c63e118 100644 (file)
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,9 +16,13 @@
 
 /*! \file */
 
+#include <config.h>
+
 #include <isc/hex.h>
 #include <isc/mem.h>
+#include <isc/parseint.h>
 #include <isc/result.h>
+#include <isc/sha2.h>
 #include <isc/task.h>
 
 #include <dns/catz.h>
@@ -27,8 +31,7 @@
 #include <dns/rdatasetiter.h>
 #include <dns/view.h>
 #include <dns/zone.h>
-#include <isc/sha2.h>
-#include <isc/parseint.h>
+
 
 /*%
  * Single member zone in a catalog

diff --git a/lib/dns/db.c b/lib/dns/db.c
index 2d4e9197e45108eb6b03befd769ccb0e30ae3030..6d1f66aa3c303f9c2be1a6839acebc8a745a9bae 100644 (file)
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009, 2011-2013, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2011-2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/include/dns/catz.h b/lib/dns/include/dns/catz.h
index 917d9586132ec2ee307c9cdc2c8d208d931d207f..7cff8b9b332c7950807410094d4ac3aeb1e5558e 100644 (file)
--- a/lib/dns/include/dns/catz.h
+++ b/lib/dns/include/dns/catz.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -454,7 +454,7 @@ isc_result_t
 dns_catz_get_iterator(dns_catz_zone_t *catz, isc_ht_iter_t **itp);
 /*%<
  * Get the hashtable iterator on catalog zone members, point '*itp' to it.
- * 
+ *
  * Returns:
  * \li #ISC_R_SUCCESS          -- success
  * \li Any other value         -- failure

diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index dfb25d406ea89362e5a7c23af7385e626df2c9be..079b06c6f9c7c894c4aa590193ed08288aba68f1 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/include/dns/events.h b/lib/dns/include/dns/events.h
index 45a1709a9e18fa986f3d200686fa806b19a9c2d3..9c4bb4a01c9fdbd9ee3fe3c36201297a0a91f52f 100644 (file)
--- a/lib/dns/include/dns/events.h
+++ b/lib/dns/include/dns/events.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009-2011, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009-2011, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
index e29d28d359b8df6a6d9a0c2ba1a20f4fa306ab07..c07905de5bc780968cc00e16d0d678597e8062f9 100644 (file)
--- a/lib/dns/include/dns/types.h
+++ b/lib/dns/include/dns/types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index b992047d028f21e21a4669dea77959d89d623859..25db4cd5bacb8c4d9444c0bde7741f8613caf982 100644 (file)
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h
index 6e5868ce711051a98865d78a638670655a6bf7f4..a43c51bd272ddb0c59612d5b5d3678c6d3379143 100644 (file)
--- a/lib/dns/include/dns/zt.h
+++ b/lib/dns/include/dns/zt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/ipkeylist.c b/lib/dns/ipkeylist.c
index a3bef8ac9fc8ab093f3ae544ce9dce411252256b..2a123e0466c1918497b8ca346d9288f3a4e9023c 100644 (file)
--- a/lib/dns/ipkeylist.c
+++ b/lib/dns/ipkeylist.c
@@ -14,6 +14,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <config.h>
+
 #include <isc/mem.h>
 #include <isc/sockaddr.h>
 #include <isc/util.h>

diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in
index 03651e5fcafb0528d92a26814ae9c562df3318a2..b5c42b350a5d62a08896a438d2b359b3c48aa9cd 100644 (file)
--- a/lib/dns/win32/libdns.def.in
+++ b/lib/dns/win32/libdns.def.in
@@ -109,27 +109,38 @@ dns_cache_setcachesize
 dns_cache_setcleaninginterval
 dns_cache_setfilename
 dns_cache_updatestats
+dns_catz_add_zone
 dns_catz_catzs_attach
 dns_catz_catzs_detach
 dns_catz_catzs_set_view
 dns_catz_dbupdate_callback
 dns_catz_entry_attach
 dns_catz_entry_cmp
+dns_catz_entry_copy
 dns_catz_entry_detach
 dns_catz_entry_getname
+dns_catz_entry_new
 dns_catz_entry_validate
+dns_catz_generate_masterfilename
+dns_catz_generate_zonecfg
 dns_catz_get_iterator
 dns_catz_get_zone
-dns_catz_options_clear
+dns_catz_new_zone
+dns_catz_new_zones
+dns_catz_options_copy
+dns_catz_options_free
 dns_catz_options_init
+dns_catz_options_setdefault
 dns_catz_postreconfig
 dns_catz_prereconfig
 dns_catz_update_from_db
+dns_catz_update_process
 dns_catz_update_taskaction
 dns_catz_zone_attach
 dns_catz_zone_detach
 dns_catz_zone_getdefoptions
 dns_catz_zone_getname
+dns_catz_zone_resetdefoptions
 dns_catz_zones_merge
 dns_cert_fromtext
 dns_cert_totext
@@ -386,6 +397,8 @@ dns_geoip_match
 dns_geoip_shutdown
 @END GEOIP
 dns_hashalg_fromtext
+dns_ipkeylist_clear
+dns_ipkeylist_copy
 dns_iptable_addprefix
 dns_iptable_addprefix2
 dns_iptable_attach
@@ -1113,6 +1126,8 @@ dns_xfrin_shutdown
 dns_zone_addnsec3chain
 dns_zone_asyncload
 dns_zone_attach
+dns_zone_catz_enable
+dns_zone_catz_enable_db
 dns_zone_cdscheck
 dns_zone_checknames
 dns_zone_clearforwardacl

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index f49d1d8a135219b4ee336c10db86ba5a394414b0..5ea93f3287ccf355d4e35d10f686b9447b8dde31 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2011-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/zt.c b/lib/dns/zt.c
index 9079d367f70001a0c32dc80af8566216fcbbe8d6..068cb869814fafacec45be0ac04ed01bb41863a4 100644 (file)
--- a/lib/dns/zt.c
+++ b/lib/dns/zt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2011-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/irs/getaddrinfo.c b/lib/irs/getaddrinfo.c
index aa0b4fe7c97e4229238178ffaad87610ad6e747c..d7b0bc4d5eb8d8887d124ca318c9ecfbdd740d09 100644 (file)
--- a/lib/irs/getaddrinfo.c
+++ b/lib/irs/getaddrinfo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2012-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 26a1954545536c7df388f814aea108491effded4..88b7feda03de0945ffb7793008b50fd0cbc173b6 100644 (file)
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/buffer.c b/lib/isc/buffer.c
index 2cf128f9a19383d9a4733ee106f2634345c0aa9f..8eb75e9b36021175856dee1b2176d4d80c88fd74 100644 (file)
--- a/lib/isc/buffer.c
+++ b/lib/isc/buffer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/ht.c b/lib/isc/ht.c
index 6d710cb4ba4661f8bb85be1c2ba3cbef439e7914..0a160f8343191944023721a6bf8ad5bcf308bb0c 100644 (file)
--- a/lib/isc/ht.c
+++ b/lib/isc/ht.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,6 +14,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <config.h>
+
 #include <string.h>
 
 #include <isc/hash.h>
@@ -326,7 +328,7 @@ isc_ht_walk(isc_ht_t *ht, isc_ht_walkfn walkfn, void *udata) {
                                        prev->next = cur;
                                }
                                isc_mem_put(ht->mctx, tmp,
-                                       sizeof(isc_ht_node_t) + tmp->keysize);
+                                       sizeof(isc_ht_node_t) + tmp->keysize);
                                ht->count--;
                        } else {
                                prev = cur;

diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h
index 275d7ec6644a0a9127284196f1d94668d985a6bd..c71718a24c3dd704c66bff97eae4c12a16ed3056 100644 (file)
--- a/lib/isc/include/isc/buffer.h
+++ b/lib/isc/include/isc/buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2010, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2010, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/include/isc/ht.h b/lib/isc/include/isc/ht.h
index 2d9d60c6166824f4f27397834dd5ee0b5cf3802a..88aaaab15ecbe2c747df50107c1e03dbf6f92441 100644 (file)
--- a/lib/isc/include/isc/ht.h
+++ b/lib/isc/include/isc/ht.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/lib/isc/task.c b/lib/isc/task.c
index 26b259a8849fa1f62b3a857a397a2b9dd09e9a0b..241099e085ef8e1602bf3fcb41e6aa942b9710d4 100644 (file)
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
index f918c29efb5a4b937ad099fad324cdd90d859ad8..e4b0f219ba7a9f08d18f818357239b270d3068c9 100644 (file)
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2016  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/lib/isc/tests/buffer_test.c b/lib/isc/tests/buffer_test.c
index af0b76a62855bf1bc6e2f7b2101bb287c7f3cd72..9c0d124378091d282d68bba16d209852695c00aa 100644 (file)
--- a/lib/isc/tests/buffer_test.c
+++ b/lib/isc/tests/buffer_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/lib/isc/tests/ht_test.c b/lib/isc/tests/ht_test.c
index cc5fe3eed615743a54344eb80ccb8fba2179190c..b8429b628297b12a4e90b402920cf219c07eabb1 100644 (file)
--- a/lib/isc/tests/ht_test.c
+++ b/lib/isc/tests/ht_test.c
@@ -27,6 +27,7 @@
 #include <isc/hash.h>
 #include <isc/ht.h>
 #include <isc/mem.h>
+#include <isc/print.h>
 #include <isc/util.h>
 
 static void *

diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in
index c339fc76d1c5fb90c90d029f38c02a766d25a32c..ad0af0a15470396ec926d926894a178d4773d0f5 100644 (file)
--- a/lib/isc/win32/libisc.def.in
+++ b/lib/isc/win32/libisc.def.in
@@ -165,6 +165,7 @@ isc_buffer_getuint8
 isc_buffer_reinit
 isc_buffer_reallocate
 isc_buffer_reserve
+isc_buffer_setautorealloc
 isc_bufferlist_availablecount
 isc_bufferlist_usedcount
 isc_commandline_parse
@@ -308,13 +309,18 @@ isc_hmacsha512_invalidate
 isc_hmacsha512_sign
 isc_hmacsha512_update
 isc_hmacsha512_verify
-isc_ht_init
+isc_ht_add
+isc_ht_count
+isc_ht_delete
 isc_ht_destroy
 isc_ht_find
-isc_ht_delete
-isc_ht_iter_get
-isc_ht_iter_inc
-isc_ht_iter_value
+isc_ht_init
+isc_ht_iter_create
+isc_ht_iter_current
+isc_ht_iter_destroy
+isc_ht_iter_first
+isc_ht_iter_next
+isc_ht_walk
 isc_httpd_addheader
 isc_httpd_addheaderuint
 isc_httpd_response

diff --git a/lib/tests/t_api.c b/lib/tests/t_api.c
index 4f1b286feb926057f652fc3180bd0dea79f74842..de646eb5a92cdecbf4fdbae59fffa0fe5401acfb 100644 (file)
--- a/lib/tests/t_api.c
+++ b/lib/tests/t_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2010, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2010, 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/util/copyrights b/util/copyrights
index 68278893b165ffc3752f59071ec78270fcafc2c1..694dffb935e2d2e242d33e75a785fbdb3146eee8 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1,5 +1,5 @@
 ./.gitattributes                               X       2015
-./.gitignore                                   X       2012,2013,2014,2015
+./.gitignore                                   X       2012,2013,2014,2015,2016
 ./Atffile                                      X       2011
 ./CHANGES                                      X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./COPYRIGHT                                    TXT     1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
@@ -232,7 +232,7 @@
 ./bin/named/include/dlz/dlz_dlopen_driver.h    C       2011
 ./bin/named/include/named/builtin.h            C       2001,2004,2005,2007
 ./bin/named/include/named/client.h             C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016
-./bin/named/include/named/config.h             C       2001,2002,2004,2005,2006,2007,2009,2013
+./bin/named/include/named/config.h             C       2001,2002,2004,2005,2006,2007,2009,2013,2016
 ./bin/named/include/named/control.h            C       2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2014,2015
 ./bin/named/include/named/fuzz.h               C       2016
 ./bin/named/include/named/geoip.h              C       2013
@@ -306,7 +306,7 @@
 ./bin/named/win32/ntservice.c                  C       1999,2000,2001,2002,2004,2006,2007,2009,2011,2013,2014,2015
 ./bin/named/win32/os.c                         C       1999,2000,2001,2002,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016
 ./bin/named/xfrout.c                           C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
-./bin/named/zoneconf.c                         C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
+./bin/named/zoneconf.c                         C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./bin/nsupdate/.gitignore                      X       2012
 ./bin/nsupdate/Makefile.in                     MAKE    2000,2001,2002,2004,2006,2007,2008,2009,2012,2013,2014,2015
 ./bin/nsupdate/nsupdate.1                      MAN     DOCBOOK
@@ -914,6 +914,14 @@
 ./bin/tests/system/case/postupdate.good                X       2015
 ./bin/tests/system/case/setup.sh               SH      2015
 ./bin/tests/system/case/tests.sh               SH      2013,2014,2015
+./bin/tests/system/catz/clean.sh               SH      2016
+./bin/tests/system/catz/ns1/catalog.example.db.in      ZONE    2016
+./bin/tests/system/catz/ns1/named.conf         CONF-C  2016
+./bin/tests/system/catz/ns2/named.conf         CONF-C  2016
+./bin/tests/system/catz/ns3/dom4.example.db    ZONE    2016
+./bin/tests/system/catz/ns3/named.conf         CONF-C  2016
+./bin/tests/system/catz/setup.sh               SH      2016
+./bin/tests/system/catz/tests.sh               SH      2016
 ./bin/tests/system/checkconf/altdb.conf                CONF-C  2014
 ./bin/tests/system/checkconf/altdlz.conf       CONF-C  2014
 ./bin/tests/system/checkconf/bad-also-notify.conf      CONF-C  2012,2013
@@ -3170,6 +3178,7 @@
 ./doc/arm/Bv9ARM.pdf                           X       2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./doc/arm/Makefile.in                          MAKE    2001,2002,2004,2005,2006,2007,2009,2012,2014,2015,2016
 ./doc/arm/README-SGML                          TXT.BRIEF       2000,2001,2004,2015
+./doc/arm/catz.xml                             SGML    2016
 ./doc/arm/dlz.xml                              SGML    2012,2013,2014,2015
 ./doc/arm/dnssec.xml                           SGML    2010,2011,2015
 ./doc/arm/dyndb.xml                            SGML    2015
@@ -3331,19 +3340,20 @@
 ./lib/bind9/win32/version.c                    C       1998,1999,2000,2001,2004,2007
 ./lib/dns/.gitignore                           X       2012,2013
 ./lib/dns/Atffile                              X       2011
-./lib/dns/Makefile.in                          MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
+./lib/dns/Makefile.in                          MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/acache.c                             C       2004,2005,2006,2007,2008,2012,2013,2015
-./lib/dns/acl.c                                        C       1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2013,2014
+./lib/dns/acl.c                                        C       1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2013,2014,2016
 ./lib/dns/adb.c                                        C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
 ./lib/dns/api                                  X       1999,2000,2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/badcache.c                           C       2014,2015,2016
 ./lib/dns/byaddr.c                             C       2000,2001,2002,2003,2004,2005,2007,2009,2013
 ./lib/dns/cache.c                              C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016
 ./lib/dns/callbacks.c                          C       1999,2000,2001,2004,2005,2007,2011,2012,2015
+./lib/dns/catz.c                               C       2016
 ./lib/dns/client.c                             C       2009,2010,2011,2012,2013,2014,2015
 ./lib/dns/clientinfo.c                         C       2011,2014
 ./lib/dns/compress.c                           C       1999,2000,2001,2004,2005,2006,2007,2015
-./lib/dns/db.c                                 C       1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2015
+./lib/dns/db.c                                 C       1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2015,2016
 ./lib/dns/dbiterator.c                         C       1999,2000,2001,2004,2005,2007
 ./lib/dns/dbtable.c                            C       1999,2000,2001,2004,2005,2007,2013
 ./lib/dns/diff.c                               C       2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2013,2014,2015
@@ -3385,11 +3395,12 @@
 ./lib/dns/include/dns/byaddr.h                 C       2000,2001,2002,2003,2004,2005,2006,2007
 ./lib/dns/include/dns/cache.h                  C       1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2013
 ./lib/dns/include/dns/callbacks.h              C       1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013
+./lib/dns/include/dns/catz.h                   C       2016
 ./lib/dns/include/dns/cert.h                   C       1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/client.h                 C       2009,2013,2014
 ./lib/dns/include/dns/clientinfo.h             C       2011,2014
 ./lib/dns/include/dns/compress.h               C       1999,2000,2001,2002,2004,2005,2006,2007,2009,2015
-./lib/dns/include/dns/db.h                     C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015
+./lib/dns/include/dns/db.h                     C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016
 ./lib/dns/include/dns/dbiterator.h             C       1999,2000,2001,2004,2005,2006,2007,2016
 ./lib/dns/include/dns/dbtable.h                        C       1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/diff.h                   C       2000,2001,2004,2005,2006,2007,2008,2009,2010,2013
@@ -3405,10 +3416,11 @@
 ./lib/dns/include/dns/dyndb.h                  C       2015,2016
 ./lib/dns/include/dns/ecdb.h                   C       2009,2012
 ./lib/dns/include/dns/edns.h                   C       2014,2015
-./lib/dns/include/dns/events.h                 C       1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2014
+./lib/dns/include/dns/events.h                 C       1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2014,2016
 ./lib/dns/include/dns/fixedname.h              C       1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/forward.h                        C       2000,2001,2004,2005,2006,2007,2009,2013,2016
 ./lib/dns/include/dns/geoip.h                  C       2013,2014
+./lib/dns/include/dns/ipkeylist.h              C       2016
 ./lib/dns/include/dns/iptable.h                        C       2007,2012,2014
 ./lib/dns/include/dns/journal.h                        C       1999,2000,2001,2004,2005,2006,2007,2008,2009,2011,2013
 ./lib/dns/include/dns/keydata.h                        C       2009
@@ -3461,20 +3473,21 @@
 ./lib/dns/include/dns/tsec.h                   C       2009,2010,2012
 ./lib/dns/include/dns/tsig.h                   C       1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011
 ./lib/dns/include/dns/ttl.h                    C       1999,2000,2001,2004,2005,2006,2007,2014
-./lib/dns/include/dns/types.h                  C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
+./lib/dns/include/dns/types.h                  C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/include/dns/update.h                 C       2011,2015
 ./lib/dns/include/dns/validator.h              C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014
 ./lib/dns/include/dns/version.h                        C       2001,2004,2005,2006,2007,2012,2013
 ./lib/dns/include/dns/view.h                   C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/include/dns/xfrin.h                  C       1999,2000,2001,2003,2004,2005,2006,2007,2009,2013
-./lib/dns/include/dns/zone.h                   C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
+./lib/dns/include/dns/zone.h                   C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/include/dns/zonekey.h                        C       2001,2004,2005,2006,2007
-./lib/dns/include/dns/zt.h                     C       1999,2000,2001,2002,2004,2005,2006,2007,2011
+./lib/dns/include/dns/zt.h                     C       1999,2000,2001,2002,2004,2005,2006,2007,2011,2016
 ./lib/dns/include/dst/Makefile.in              MAKE    1998,1999,2000,2001,2004,2007,2012,2015
 ./lib/dns/include/dst/dst.h                    C       2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
 ./lib/dns/include/dst/gssapi.h                 C       2000,2001,2004,2005,2006,2007,2009,2010,2011,2013
 ./lib/dns/include/dst/lib.h                    C       1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dst/result.h                 C       1999,2000,2001,2004,2005,2006,2007,2008,2012,2014
+./lib/dns/ipkeylist.c                          C       2016
 ./lib/dns/iptable.c                            C       2007,2008,2009,2013,2014
 ./lib/dns/journal.c                            C       1999,2000,2001,2002,2004,2005,2007,2008,2009,2010,2011,2013,2014,2015
 ./lib/dns/key.c                                        C       2001,2004,2005,2006,2007,2011
@@ -3785,16 +3798,16 @@
 ./lib/dns/win32/libdns.vcxproj.in              X       2013,2014,2015,2016
 ./lib/dns/win32/libdns.vcxproj.user            X       2013
 ./lib/dns/win32/version.c                      C       1998,1999,2000,2001,2004,2007,2013
-./lib/dns/xfrin.c                              C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013,2014,2015
+./lib/dns/xfrin.c                              C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2012,2013,2014,2015,2016
 ./lib/dns/zone.c                               C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/zonekey.c                            C       2001,2003,2004,2005,2007
-./lib/dns/zt.c                                 C       1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013,2014,2015
+./lib/dns/zt.c                                 C       1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013,2014,2015,2016
 ./lib/irs/Makefile.in                          MAKE    2009,2012,2014,2015
 ./lib/irs/api                                  X       2009,2010,2011,2012,2013,2014,2015
 ./lib/irs/context.c                            C       2009,2014
 ./lib/irs/dnsconf.c                            C       2009,2012
 ./lib/irs/gai_strerror.c                       C       2009,2014
-./lib/irs/getaddrinfo.c                                C       2009,2012,2013,2014,2015
+./lib/irs/getaddrinfo.c                                C       2009,2012,2013,2014,2015,2016
 ./lib/irs/getnameinfo.c                                C       2009,2011,2012,2013,2014
 ./lib/irs/include/Makefile.in                  MAKE    2009,2012
 ./lib/irs/include/irs/Makefile.in              MAKE    2009,2012,2014
@@ -3824,7 +3837,7 @@
 ./lib/irs/win32/version.c                      C       2014
 ./lib/isc/.gitignore                           X       2014
 ./lib/isc/Atffile                              X       2011
-./lib/isc/Makefile.in                          MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
+./lib/isc/Makefile.in                          MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/isc/aes.c                                        C       2014
 ./lib/isc/alpha/Makefile.in                    MAKE    2007,2012
 ./lib/isc/alpha/include/Makefile.in            MAKE    2007,2012
@@ -3838,7 +3851,7 @@
 ./lib/isc/base32.c                             C       2008,2009,2013,2014,2015
 ./lib/isc/base64.c                             C       1998,1999,2000,2001,2003,2004,2005,2007,2009,2013,2014,2015
 ./lib/isc/bind9.c                              C       2013
-./lib/isc/buffer.c                             C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2012,2014,2015
+./lib/isc/buffer.c                             C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2012,2014,2015,2016
 ./lib/isc/bufferlist.c                         C       1999,2000,2001,2004,2005,2007
 ./lib/isc/chacha_private.h                     X       2014
 ./lib/isc/commandline.c                                C.PORTION       1999,2000,2001,2004,2005,2007,2008,2014,2015
@@ -3853,6 +3866,7 @@
 ./lib/isc/hex.c                                        C       2000,2001,2002,2003,2004,2005,2007,2008,2013,2014,2015
 ./lib/isc/hmacmd5.c                            C       2000,2001,2004,2005,2006,2007,2009,2013,2014,2015
 ./lib/isc/hmacsha.c                            C       2005,2006,2007,2009,2011,2012,2013,2014,2015
+./lib/isc/ht.c                                 C       2016
 ./lib/isc/httpd.c                              C       2006,2007,2008,2010,2011,2012,2013,2014,2015,2016
 ./lib/isc/ia64/Makefile.in                     MAKE    2007,2012
 ./lib/isc/ia64/include/Makefile.in             MAKE    2007,2012
@@ -3868,7 +3882,7 @@
 ./lib/isc/include/isc/base64.h                 C       1999,2000,2001,2004,2005,2006,2007
 ./lib/isc/include/isc/bind9.h                  C       2009,2013
 ./lib/isc/include/isc/boolean.h                        C       1998,1999,2000,2001,2004,2005,2006,2007
-./lib/isc/include/isc/buffer.h                 C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2010,2012,2014
+./lib/isc/include/isc/buffer.h                 C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2010,2012,2014,2016
 ./lib/isc/include/isc/bufferlist.h             C       1999,2000,2001,2004,2005,2006,2007
 ./lib/isc/include/isc/commandline.h            C       1999,2000,2001,2004,2005,2006,2007,2015
 ./lib/isc/include/isc/counter.h                        C       2014
@@ -3885,6 +3899,7 @@
 ./lib/isc/include/isc/hex.h                    C       2000,2001,2004,2005,2006,2007,2008
 ./lib/isc/include/isc/hmacmd5.h                        C       2000,2001,2004,2005,2006,2007,2009,2014
 ./lib/isc/include/isc/hmacsha.h                        C       2005,2006,2007,2009,2014
+./lib/isc/include/isc/ht.h                     C       2016
 ./lib/isc/include/isc/httpd.h                  C       2006,2007,2008,2014,2016
 ./lib/isc/include/isc/interfaceiter.h          C       1999,2000,2001,2004,2005,2006,2007
 ./lib/isc/include/isc/ipv6.h                   C       1999,2000,2001,2002,2004,2005,2007
@@ -4029,16 +4044,17 @@
 ./lib/isc/string.c                             C       1999,2000,2001,2003,2004,2005,2006,2007,2011,2012,2014,2015
 ./lib/isc/strtoul.c                            C       2003,2004,2005,2007,2014
 ./lib/isc/symtab.c                             C       1996,1997,1998,1999,2000,2001,2004,2005,2007,2011,2012,2013
-./lib/isc/task.c                               C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
+./lib/isc/task.c                               C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/isc/task_p.h                             C       2000,2001,2004,2005,2007,2009,2011,2012,2013
 ./lib/isc/taskpool.c                           C       1999,2000,2001,2004,2005,2007,2011,2012,2013
 ./lib/isc/tests/Atffile                                X       2011
-./lib/isc/tests/Makefile.in                    MAKE    2011,2012,2013,2014,2015
+./lib/isc/tests/Makefile.in                    MAKE    2011,2012,2013,2014,2015,2016
 ./lib/isc/tests/aes_test.c                     C       2014
-./lib/isc/tests/buffer_test.c                  C       2014,2015
+./lib/isc/tests/buffer_test.c                  C       2014,2015,2016
 ./lib/isc/tests/counter_test.c                 C       2014
 ./lib/isc/tests/file_test.c                    C       2014
 ./lib/isc/tests/hash_test.c                    C       2011,2012,2013,2014,2015,2016
+./lib/isc/tests/ht_test.c                      C       2016
 ./lib/isc/tests/isctest.c                      C       2011,2012,2013,2014
 ./lib/isc/tests/isctest.h                      C       2011,2012
 ./lib/isc/tests/lex_test.c                     C       2013
@@ -4417,7 +4433,7 @@
 ./lib/tests/include/Makefile.in                        MAKE    1998,1999,2000,2001,2004,2007,2012
 ./lib/tests/include/tests/Makefile.in          MAKE    1999,2000,2001,2004,2007,2012,2015
 ./lib/tests/include/tests/t_api.h              C       1999,2000,2001,2004,2005,2006,2007,2010,2013,2014
-./lib/tests/t_api.c                            C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010,2013,2014
+./lib/tests/t_api.c                            C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010,2013,2014,2016
 ./lib/tests/win32/DLLMain.c                    C       2013
 ./lib/tests/win32/libtests.def                 X       2013
 ./lib/tests/win32/libtests.dsp.in              X       2013