From: Evan Hunt Date: Thu, 26 May 2016 19:36:17 +0000 (-0700) Subject: [master] copyrights, win32 definitions X-Git-Tag: v9.11.0a3~38 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=6c2a76b3e2ccd32c35814b6e0f54da00190749d7;p=thirdparty%2Fbind9.git [master] copyrights, win32 definitions --- diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h index f051bfeca39..1e7123b9bc6 100644 --- 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 b2a7650b63f..88d14ad0812 100644 --- 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 2d297a7c80c..6e81c0835ad 100644 --- 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 4e4bdc4316f..bf1b2d5aa9e 100644 --- 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 53013fe837d..2254d184742 100644 --- 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 db67cbfffa7..e096977394f 100644 --- 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 9df04aeee00..4cd508d78bd 100644 --- 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 4cbd501e074..2373dce3364 100644 --- 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 d4cb7954a40..0b9e5b4e7ff 100644 --- 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 ece0f4f9e6d..8e0d3e8d86b 100644 --- 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 77d54414b7a..c72b99c6907 100644 --- 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 9316ee8c6d0..edbea9c73d2 100644 --- 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. --> +
Catalog Zones @@ -119,7 +120,7 @@ catalog-zones { be a slave zone. - The option defines the default masters + The 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 335d2f74da6..95aae2ccda4 100644 --- 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 d2d51395307..16450a245cb 100644 --- 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 4866a5a1b5f..f99fa56fbc5 100644 --- 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 + #include #include +#include #include +#include #include #include @@ -27,8 +31,7 @@ #include #include #include -#include -#include + /*% * Single member zone in a catalog diff --git a/lib/dns/db.c b/lib/dns/db.c index 2d4e9197e45..6d1f66aa3c3 100644 --- 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 917d9586132..7cff8b9b332 100644 --- 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 dfb25d406ea..079b06c6f9c 100644 --- 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 45a1709a9e1..9c4bb4a01c9 100644 --- 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 e29d28d359b..c07905de5bc 100644 --- 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 b992047d028..25db4cd5bac 100644 --- 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 6e5868ce711..a43c51bd272 100644 --- 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 a3bef8ac9fc..2a123e0466c 100644 --- a/lib/dns/ipkeylist.c +++ b/lib/dns/ipkeylist.c @@ -14,6 +14,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#include + #include #include #include diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in index 03651e5fcaf..b5c42b350a5 100644 --- 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 f49d1d8a135..5ea93f3287c 100644 --- 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 9079d367f70..068cb869814 100644 --- 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 aa0b4fe7c97..d7b0bc4d5eb 100644 --- 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 26a19545455..88b7feda03d 100644 --- 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 2cf128f9a19..8eb75e9b360 100644 --- 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 6d710cb4ba4..0a160f83431 100644 --- 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 + #include #include @@ -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 275d7ec6644..c71718a24c3 100644 --- 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 2d9d60c6166..88aaaab15ec 100644 --- 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 26b259a8849..241099e085e 100644 --- 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 f918c29efb5..e4b0f219ba7 100644 --- 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 af0b76a6285..9c0d1243780 100644 --- 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 cc5fe3eed61..b8429b62829 100644 --- a/lib/isc/tests/ht_test.c +++ b/lib/isc/tests/ht_test.c @@ -27,6 +27,7 @@ #include #include #include +#include #include static void * diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in index c339fc76d1c..ad0af0a1547 100644 --- 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 4f1b286feb9..de646eb5a92 100644 --- 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 68278893b16..694dffb935e 100644 --- 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