diff --git a/bin/tests/system/forward/rfc1918-inherited.conf b/bin/tests/system/forward/rfc1918-inherited.conf index 3d40b986d3..0740de5706 100644 --- a/bin/tests/system/forward/rfc1918-inherited.conf +++ b/bin/tests/system/forward/rfc1918-inherited.conf @@ -1,3 +1,19 @@ +/* + * 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. + */ + zone 10.in-addr.arpa { type forward; forwarders { 1.2.3.4; }; diff --git a/bin/tests/system/forward/rfc1918-notinherited.conf b/bin/tests/system/forward/rfc1918-notinherited.conf index 37dc0a9f9d..06aaba6278 100644 --- a/bin/tests/system/forward/rfc1918-notinherited.conf +++ b/bin/tests/system/forward/rfc1918-notinherited.conf @@ -1,3 +1,19 @@ +/* + * 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. + */ + zone 10.in-addr.arpa { type forward; forward first; diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh index b8d270ad19..37878da79e 100644 --- a/bin/tests/system/forward/tests.sh +++ b/bin/tests/system/forward/tests.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007, 2011-2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2011-2014, 2016 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000, 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/forward/ula-inherited.conf b/bin/tests/system/forward/ula-inherited.conf index 242bf9e732..1adc2c113d 100644 --- a/bin/tests/system/forward/ula-inherited.conf +++ b/bin/tests/system/forward/ula-inherited.conf @@ -1,3 +1,19 @@ +/* + * 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. + */ + zone d.f.ip6.arpa { type forward; forwarders { 1.2.3.4; }; diff --git a/bin/tests/system/forward/ula-notinherited.conf b/bin/tests/system/forward/ula-notinherited.conf index b3860e2658..5ed4ca2e76 100644 --- a/bin/tests/system/forward/ula-notinherited.conf +++ b/bin/tests/system/forward/ula-notinherited.conf @@ -1,3 +1,19 @@ +/* + * 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. + */ + zone d.f.ip6.arpa { type forward; forward first; diff --git a/lib/bind9/check.c b/lib/bind9/check.c index 768913c709..f978abd544 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.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) 2001-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h index 7ec75758e7..20aafc3816 100644 --- a/lib/dns/include/dns/name.h +++ b/lib/dns/include/dns/name.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009-2013, 2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009-2013, 2015, 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/rbt.h b/lib/dns/include/dns/rbt.h index ed262bf8bd..3df17890fd 100644 --- a/lib/dns/include/dns/rbt.h +++ b/lib/dns/include/dns/rbt.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009, 2012-2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009, 2012-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/util/copyrights b/util/copyrights index 2bd31fe863..643dc86d81 100644 --- a/util/copyrights +++ b/util/copyrights @@ -1416,7 +1416,11 @@ ./bin/tests/system/forward/ns4/root.db ZONE 2000,2001,2004,2007 ./bin/tests/system/forward/ns5/named.conf CONF-C 2011 ./bin/tests/system/forward/ns5/root.db ZONE 2011 -./bin/tests/system/forward/tests.sh SH 2000,2001,2004,2007,2011,2012,2013,2014 +./bin/tests/system/forward/rfc1918-inherited.conf CONF-C 2016 +./bin/tests/system/forward/rfc1918-notinherited.conf CONF-C 2016 +./bin/tests/system/forward/tests.sh SH 2000,2001,2004,2007,2011,2012,2013,2014,2016 +./bin/tests/system/forward/ula-inherited.conf CONF-C 2016 +./bin/tests/system/forward/ula-notinherited.conf CONF-C 2016 ./bin/tests/system/genzone.sh SH 2001,2002,2003,2004,2007,2009,2011,2012,2013,2014,2015,2016 ./bin/tests/system/geoip/.gitignore X 2013 ./bin/tests/system/geoip/Makefile.in MAKE 2013,2015 @@ -3214,7 +3218,7 @@ ./lib/Makefile.in MAKE 1998,1999,2000,2001,2003,2004,2007,2012,2013,2014 ./lib/bind9/Makefile.in MAKE 2001,2004,2007,2009,2012,2014,2015 ./lib/bind9/api X 2001,2006,2008,2009,2010,2011,2012,2013,2014,2015 -./lib/bind9/check.c C 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015 +./lib/bind9/check.c C 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 ./lib/bind9/getaddresses.c C 2001,2002,2004,2005,2007,2014,2015 ./lib/bind9/include/Makefile.in MAKE 2001,2004,2007,2012 ./lib/bind9/include/bind9/Makefile.in MAKE 2001,2004,2007,2012,2015 @@ -3323,7 +3327,7 @@ ./lib/dns/include/dns/master.h C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014 ./lib/dns/include/dns/masterdump.h C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2011,2013,2014,2015 ./lib/dns/include/dns/message.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015 -./lib/dns/include/dns/name.h C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2015 +./lib/dns/include/dns/name.h C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013,2015,2016 ./lib/dns/include/dns/ncache.h C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2013 ./lib/dns/include/dns/nsec.h C 1999,2000,2001,2003,2004,2005,2006,2007,2008,2011,2012 ./lib/dns/include/dns/nsec3.h C 2008,2009,2010,2011,2012,2013 @@ -3333,7 +3337,7 @@ ./lib/dns/include/dns/peer.h C 2000,2001,2003,2004,2005,2006,2007,2008,2009,2013,2014,2015 ./lib/dns/include/dns/portlist.h C 2003,2004,2005,2006,2007 ./lib/dns/include/dns/private.h C 2009,2011,2012 -./lib/dns/include/dns/rbt.h C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015 +./lib/dns/include/dns/rbt.h C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016 ./lib/dns/include/dns/rcode.h C 1999,2000,2001,2004,2005,2006,2007,2008 ./lib/dns/include/dns/rdata.h C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2016 ./lib/dns/include/dns/rdataclass.h C 1998,1999,2000,2001,2004,2005,2006,2007,2016