From fa2ed4b62762ec711046012758228f8e44a01110 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 28 Oct 2016 11:30:47 +1100 Subject: [PATCH] update copyrights --- bin/dig/nslookup.c | 2 +- lib/irs/Makefile.in | 2 +- lib/irs/resconf.c | 2 +- lib/irs/tests/Makefile.in | 16 ++++++--- lib/irs/tests/resconf_test.c | 18 ++++++++--- lib/irs/tests/testdata/domain.conf | 14 ++++++++ lib/irs/tests/testdata/nameserver-v4.conf | 14 ++++++++ lib/irs/tests/testdata/nameserver-v6.conf | 14 ++++++++ lib/irs/tests/testdata/options-debug.conf | 14 ++++++++ lib/irs/tests/testdata/options-ndots.conf | 14 ++++++++ lib/irs/tests/testdata/options-timeout.conf | 14 ++++++++ lib/irs/tests/testdata/options-unknown.conf | 14 ++++++++ lib/irs/tests/testdata/options.conf | 14 ++++++++ lib/irs/tests/testdata/port.conf | 14 ++++++++ lib/irs/tests/testdata/resolv.conf | 14 ++++++++ lib/irs/tests/testdata/search.conf | 14 ++++++++ lib/irs/tests/testdata/sortlist-v4.conf | 14 ++++++++ lib/irs/tests/testdata/timeout.conf | 14 ++++++++ lib/irs/tests/testdata/unknown.conf | 14 ++++++++ lib/isc/include/isc/sockaddr.h | 2 +- lib/isc/include/isc/types.h | 2 +- lib/isccfg/Makefile.in | 2 +- util/copyrights | 36 +++++++++++++++------ 23 files changed, 254 insertions(+), 24 deletions(-) diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index 13d514f528..f5a496cde2 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.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) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in index 6c4890d6d7..7ff90ca886 100644 --- a/lib/irs/Makefile.in +++ b/lib/irs/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009, 2012, 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/irs/resconf.c b/lib/irs/resconf.c index e9aa0ee27d..2ec6ac85c9 100644 --- a/lib/irs/resconf.c +++ b/lib/irs/resconf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, 2011, 2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009, 2011, 2012, 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/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in index 58d797c12a..6db1d84c35 100644 --- a/lib/irs/tests/Makefile.in +++ b/lib/irs/tests/Makefile.in @@ -1,8 +1,16 @@ -# Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") # -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# 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. # $Id$ diff --git a/lib/irs/tests/resconf_test.c b/lib/irs/tests/resconf_test.c index 21bc6494be..f2378f557d 100644 --- a/lib/irs/tests/resconf_test.c +++ b/lib/irs/tests/resconf_test.c @@ -1,9 +1,17 @@ /* - * Copyright (C) 2014, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * 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. */ #include @@ -98,7 +106,7 @@ ATF_TC_BODY(irs_resconf_load, tc) { "testdata/unknown.conf", ISC_R_SUCCESS, NULL, ISC_R_SUCCESS } - + }; UNUSED(tc); diff --git a/lib/irs/tests/testdata/domain.conf b/lib/irs/tests/testdata/domain.conf index 6c458e6828..70caf37775 100644 --- a/lib/irs/tests/testdata/domain.conf +++ b/lib/irs/tests/testdata/domain.conf @@ -1 +1,15 @@ +# 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. + domain example.com diff --git a/lib/irs/tests/testdata/nameserver-v4.conf b/lib/irs/tests/testdata/nameserver-v4.conf index 84fcf26ee5..4505cc8cda 100644 --- a/lib/irs/tests/testdata/nameserver-v4.conf +++ b/lib/irs/tests/testdata/nameserver-v4.conf @@ -1 +1,15 @@ +# 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. + nameserver 10.0.0.1 diff --git a/lib/irs/tests/testdata/nameserver-v6.conf b/lib/irs/tests/testdata/nameserver-v6.conf index cac6273623..7b0a13e14a 100644 --- a/lib/irs/tests/testdata/nameserver-v6.conf +++ b/lib/irs/tests/testdata/nameserver-v6.conf @@ -1 +1,15 @@ +# 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. + nameserver 2001:DB8::1 diff --git a/lib/irs/tests/testdata/options-debug.conf b/lib/irs/tests/testdata/options-debug.conf index 9c311372b1..a8cb5b16d9 100644 --- a/lib/irs/tests/testdata/options-debug.conf +++ b/lib/irs/tests/testdata/options-debug.conf @@ -1 +1,15 @@ +# 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. + options debug diff --git a/lib/irs/tests/testdata/options-ndots.conf b/lib/irs/tests/testdata/options-ndots.conf index f3a23e296b..4a584176f3 100644 --- a/lib/irs/tests/testdata/options-ndots.conf +++ b/lib/irs/tests/testdata/options-ndots.conf @@ -1 +1,15 @@ +# 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. + option ndots:2 diff --git a/lib/irs/tests/testdata/options-timeout.conf b/lib/irs/tests/testdata/options-timeout.conf index 6914e324da..f70e550950 100644 --- a/lib/irs/tests/testdata/options-timeout.conf +++ b/lib/irs/tests/testdata/options-timeout.conf @@ -1 +1,15 @@ +# 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. + options timeout:1 diff --git a/lib/irs/tests/testdata/options-unknown.conf b/lib/irs/tests/testdata/options-unknown.conf index d9a095acc6..6d6b01f915 100644 --- a/lib/irs/tests/testdata/options-unknown.conf +++ b/lib/irs/tests/testdata/options-unknown.conf @@ -1 +1,15 @@ +# 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. + options unknown diff --git a/lib/irs/tests/testdata/options.conf b/lib/irs/tests/testdata/options.conf index 8d31c27807..acb028e761 100644 --- a/lib/irs/tests/testdata/options.conf +++ b/lib/irs/tests/testdata/options.conf @@ -1 +1,15 @@ +# 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. + options unknown debug timeout:1 ndots:2 diff --git a/lib/irs/tests/testdata/port.conf b/lib/irs/tests/testdata/port.conf index 5333a58caf..7fcf025137 100644 --- a/lib/irs/tests/testdata/port.conf +++ b/lib/irs/tests/testdata/port.conf @@ -1 +1,15 @@ +# 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. + port 5300 diff --git a/lib/irs/tests/testdata/resolv.conf b/lib/irs/tests/testdata/resolv.conf index 916634b8bf..dfbba23331 100644 --- a/lib/irs/tests/testdata/resolv.conf +++ b/lib/irs/tests/testdata/resolv.conf @@ -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. + port 5300 nameserver 10.0.0.1 nameserver 2001:DB8::1 diff --git a/lib/irs/tests/testdata/search.conf b/lib/irs/tests/testdata/search.conf index 464390cbaf..80345ba94f 100644 --- a/lib/irs/tests/testdata/search.conf +++ b/lib/irs/tests/testdata/search.conf @@ -1 +1,15 @@ +# 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. + search example.com example.net diff --git a/lib/irs/tests/testdata/sortlist-v4.conf b/lib/irs/tests/testdata/sortlist-v4.conf index 5cb283f442..64305b4cc9 100644 --- a/lib/irs/tests/testdata/sortlist-v4.conf +++ b/lib/irs/tests/testdata/sortlist-v4.conf @@ -1 +1,15 @@ +# 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. + sortlist 130.155.160.0/255.255.240.0 130.155.0.0 diff --git a/lib/irs/tests/testdata/timeout.conf b/lib/irs/tests/testdata/timeout.conf index 6655b89321..0637787cde 100644 --- a/lib/irs/tests/testdata/timeout.conf +++ b/lib/irs/tests/testdata/timeout.conf @@ -1 +1,15 @@ +# 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. + timeout 10 diff --git a/lib/irs/tests/testdata/unknown.conf b/lib/irs/tests/testdata/unknown.conf index 27ceb3e0e7..ac7d3aca59 100644 --- a/lib/irs/tests/testdata/unknown.conf +++ b/lib/irs/tests/testdata/unknown.conf @@ -1 +1,15 @@ +# 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. + unknown directive diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h index c76cd3ce08..3b2287a69a 100644 --- a/lib/isc/include/isc/sockaddr.h +++ b/lib/isc/include/isc/sockaddr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009, 2012, 2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009, 2012, 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/isc/include/isc/types.h b/lib/isc/include/isc/types.h index 3aa147ff7d..53a2790880 100644 --- a/lib/isc/include/isc/types.h +++ b/lib/isc/include/isc/types.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009, 2012, 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009, 2012, 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/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in index 7f627655c3..befcf963f4 100644 --- a/lib/isccfg/Makefile.in +++ b/lib/isccfg/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012, 2014-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/util/copyrights b/util/copyrights index 5eecedb414..35469ec7cc 100644 --- a/util/copyrights +++ b/util/copyrights @@ -89,7 +89,7 @@ ./bin/dig/host.html HTML DOCBOOK ./bin/dig/include/dig/dig.h C 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015 ./bin/dig/nslookup.1 MAN DOCBOOK -./bin/dig/nslookup.c C 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015 +./bin/dig/nslookup.c C 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 ./bin/dig/nslookup.docbook SGML 2004,2005,2006,2007,2010,2013,2014,2015,2016 ./bin/dig/nslookup.html HTML DOCBOOK ./bin/dig/win32/dig.dsp.in X 2001,2002,2004,2005,2006,2009,2013 @@ -2800,7 +2800,7 @@ ./isc-config.sh.html HTML DOCBOOK ./isc-config.sh.in SH 2000,2001,2003,2004,2007,2012,2013,2015 ./lib/.gitignore X 2012 -./lib/Atffile X 2011,2014 +./lib/Atffile X 2011,2014,2016 ./lib/Makefile.in MAKE 1998,1999,2000,2001,2003,2004,2007,2012,2013 ./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,2016 @@ -3277,7 +3277,8 @@ ./lib/export/samples/sample-request.c C 2009,2012,2013,2014,2015,2016 ./lib/export/samples/sample-update.c C 2009,2010,2012,2013,2014,2015,2016 ./lib/export/samples/sample.c C 2009,2012,2013,2014,2015,2016 -./lib/irs/Makefile.in MAKE 2009,2012,2014,2015 +./lib/irs/Atffile X 2016 +./lib/irs/Makefile.in MAKE 2009,2012,2014,2015,2016 ./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 @@ -3293,7 +3294,24 @@ ./lib/irs/include/irs/resconf.h C 2009,2014 ./lib/irs/include/irs/types.h C 2009 ./lib/irs/include/irs/version.h C 2009 -./lib/irs/resconf.c C 2009,2011,2012,2014,2015 +./lib/irs/resconf.c C 2009,2011,2012,2014,2015,2016 +./lib/irs/tests/Atffile X 2016 +./lib/irs/tests/Makefile.in MAKE 2016 +./lib/irs/tests/resconf_test.c C 2016 +./lib/irs/tests/testdata/domain.conf CONF-SH 2016 +./lib/irs/tests/testdata/nameserver-v4.conf CONF-SH 2016 +./lib/irs/tests/testdata/nameserver-v6.conf CONF-SH 2016 +./lib/irs/tests/testdata/options-debug.conf CONF-SH 2016 +./lib/irs/tests/testdata/options-ndots.conf CONF-SH 2016 +./lib/irs/tests/testdata/options-timeout.conf CONF-SH 2016 +./lib/irs/tests/testdata/options-unknown.conf CONF-SH 2016 +./lib/irs/tests/testdata/options.conf CONF-SH 2016 +./lib/irs/tests/testdata/port.conf CONF-SH 2016 +./lib/irs/tests/testdata/resolv.conf CONF-SH 2016 +./lib/irs/tests/testdata/search.conf CONF-SH 2016 +./lib/irs/tests/testdata/sortlist-v4.conf CONF-SH 2016 +./lib/irs/tests/testdata/timeout.conf CONF-SH 2016 +./lib/irs/tests/testdata/unknown.conf CONF-SH 2016 ./lib/irs/version.c C 2009 ./lib/isc/.gitignore X 2014 ./lib/isc/Atffile X 2011 @@ -3397,7 +3415,7 @@ ./lib/isc/include/isc/serial.h C 1999,2000,2001,2004,2005,2006,2007,2009 ./lib/isc/include/isc/sha1.h C 2000,2001,2004,2005,2006,2007,2009 ./lib/isc/include/isc/sha2.h C 2005,2006,2007,2009 -./lib/isc/include/isc/sockaddr.h C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2012,2015 +./lib/isc/include/isc/sockaddr.h C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2012,2015,2016 ./lib/isc/include/isc/socket.h C 1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2016 ./lib/isc/include/isc/stats.h C 2009,2012 ./lib/isc/include/isc/stdio.h C 2000,2001,2004,2005,2006,2007,2013 @@ -3408,7 +3426,7 @@ ./lib/isc/include/isc/taskpool.h C 1999,2000,2001,2004,2005,2006,2007,2011,2012 ./lib/isc/include/isc/timer.h C 1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012,2014 ./lib/isc/include/isc/tm.h C 2014 -./lib/isc/include/isc/types.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2014 +./lib/isc/include/isc/types.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2014,2016 ./lib/isc/include/isc/util.h C 1998,1999,2000,2001,2004,2005,2006,2007,2010,2011,2012,2015,2016 ./lib/isc/include/isc/version.h C 2001,2004,2005,2006,2007 ./lib/isc/include/isc/xml.h C 2006,2007 @@ -3665,7 +3683,7 @@ ./lib/isccc/win32/libisccc.vcxproj.in X 2013,2015,2016 ./lib/isccc/win32/libisccc.vcxproj.user X 2013 ./lib/isccc/win32/version.c C 2001,2004,2007 -./lib/isccfg/Makefile.in MAKE 2001,2002,2003,2004,2005,2007,2009,2011,2012,2014,2015 +./lib/isccfg/Makefile.in MAKE 2001,2002,2003,2004,2005,2007,2009,2011,2012,2014,2015,2016 ./lib/isccfg/aclconf.c C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014,2016 ./lib/isccfg/api X 2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016 ./lib/isccfg/dnsconf.c C 2009 @@ -4192,10 +4210,10 @@ ./version X 1998,1999,2000,2001,2003,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 ./win32utils/Configure PERL 2013,2014,2015,2016 ./win32utils/GeoIP.diff X 2013 -./win32utils/bind9.sln.in X 2013,2014 +./win32utils/bind9.sln.in X 2013,2014,2016 ./win32utils/build.txt TXT.BRIEF 2013,2014,2015,2016 ./win32utils/index.html HTML 2006,2007,2008,2012,2013,2015 -./win32utils/legacy/BINDBuild.dsw.in X 2001,2005,2006,2008,2009,2010,2013,2015 +./win32utils/legacy/BINDBuild.dsw.in X 2001,2005,2006,2008,2009,2010,2013,2015,2016 ./win32utils/legacy/BuildAll.bat.in BAT 2001,2002,2004,2005,2006,2007,2008,2009,2010,2013 ./win32utils/legacy/BuildPost.bat.in BAT 2005,2006,2013,2016 ./win32utils/legacy/BuildSetup.bat.in BAT 2001,2002,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015,2016