From c29c3e51b1d7502c8d9978633df43e6a267bc427 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 28 Oct 2016 11:28:44 +1100 Subject: [PATCH] update copyrights --- lib/irs/tests/Makefile.in | 2 +- lib/irs/tests/resconf_test.c | 4 ++-- lib/irs/tests/testdata/domain.conf | 6 ++++++ lib/irs/tests/testdata/nameserver-v4.conf | 6 ++++++ lib/irs/tests/testdata/nameserver-v6.conf | 6 ++++++ lib/irs/tests/testdata/options-debug.conf | 6 ++++++ lib/irs/tests/testdata/options-ndots.conf | 6 ++++++ lib/irs/tests/testdata/options-timeout.conf | 6 ++++++ lib/irs/tests/testdata/options-unknown.conf | 6 ++++++ lib/irs/tests/testdata/options.conf | 6 ++++++ lib/irs/tests/testdata/port.conf | 6 ++++++ lib/irs/tests/testdata/resolv.conf | 6 ++++++ lib/irs/tests/testdata/search.conf | 6 ++++++ lib/irs/tests/testdata/sortlist-v4.conf | 6 ++++++ lib/irs/tests/testdata/timeout.conf | 6 ++++++ lib/irs/tests/testdata/unknown.conf | 6 ++++++ util/copyrights | 18 ++++++++++++++++++ 17 files changed, 105 insertions(+), 3 deletions(-) diff --git a/lib/irs/tests/Makefile.in b/lib/irs/tests/Makefile.in index 58d797c12a..c854014e7e 100644 --- a/lib/irs/tests/Makefile.in +++ b/lib/irs/tests/Makefile.in @@ -1,4 +1,4 @@ -# 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 diff --git a/lib/irs/tests/resconf_test.c b/lib/irs/tests/resconf_test.c index 21bc6494be..0f9350860d 100644 --- a/lib/irs/tests/resconf_test.c +++ b/lib/irs/tests/resconf_test.c @@ -1,5 +1,5 @@ /* - * 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 @@ -98,7 +98,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..17e7a6abb4 100644 --- a/lib/irs/tests/testdata/domain.conf +++ b/lib/irs/tests/testdata/domain.conf @@ -1 +1,7 @@ +# 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/. + domain example.com diff --git a/lib/irs/tests/testdata/nameserver-v4.conf b/lib/irs/tests/testdata/nameserver-v4.conf index 84fcf26ee5..b15b681901 100644 --- a/lib/irs/tests/testdata/nameserver-v4.conf +++ b/lib/irs/tests/testdata/nameserver-v4.conf @@ -1 +1,7 @@ +# 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/. + 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..29a4b468f3 100644 --- a/lib/irs/tests/testdata/nameserver-v6.conf +++ b/lib/irs/tests/testdata/nameserver-v6.conf @@ -1 +1,7 @@ +# 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/. + nameserver 2001:DB8::1 diff --git a/lib/irs/tests/testdata/options-debug.conf b/lib/irs/tests/testdata/options-debug.conf index 9c311372b1..2c19bc3c23 100644 --- a/lib/irs/tests/testdata/options-debug.conf +++ b/lib/irs/tests/testdata/options-debug.conf @@ -1 +1,7 @@ +# 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/. + options debug diff --git a/lib/irs/tests/testdata/options-ndots.conf b/lib/irs/tests/testdata/options-ndots.conf index f3a23e296b..d8327bae4e 100644 --- a/lib/irs/tests/testdata/options-ndots.conf +++ b/lib/irs/tests/testdata/options-ndots.conf @@ -1 +1,7 @@ +# 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/. + option ndots:2 diff --git a/lib/irs/tests/testdata/options-timeout.conf b/lib/irs/tests/testdata/options-timeout.conf index 6914e324da..da1b9d8b82 100644 --- a/lib/irs/tests/testdata/options-timeout.conf +++ b/lib/irs/tests/testdata/options-timeout.conf @@ -1 +1,7 @@ +# 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/. + options timeout:1 diff --git a/lib/irs/tests/testdata/options-unknown.conf b/lib/irs/tests/testdata/options-unknown.conf index d9a095acc6..d0a06c075c 100644 --- a/lib/irs/tests/testdata/options-unknown.conf +++ b/lib/irs/tests/testdata/options-unknown.conf @@ -1 +1,7 @@ +# 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/. + options unknown diff --git a/lib/irs/tests/testdata/options.conf b/lib/irs/tests/testdata/options.conf index 8d31c27807..969395dea4 100644 --- a/lib/irs/tests/testdata/options.conf +++ b/lib/irs/tests/testdata/options.conf @@ -1 +1,7 @@ +# 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/. + 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..6812412ee1 100644 --- a/lib/irs/tests/testdata/port.conf +++ b/lib/irs/tests/testdata/port.conf @@ -1 +1,7 @@ +# 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/. + port 5300 diff --git a/lib/irs/tests/testdata/resolv.conf b/lib/irs/tests/testdata/resolv.conf index 916634b8bf..cd443935c6 100644 --- a/lib/irs/tests/testdata/resolv.conf +++ b/lib/irs/tests/testdata/resolv.conf @@ -1,3 +1,9 @@ +# 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/. + 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..bd967cf325 100644 --- a/lib/irs/tests/testdata/search.conf +++ b/lib/irs/tests/testdata/search.conf @@ -1 +1,7 @@ +# 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/. + 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..49c765118c 100644 --- a/lib/irs/tests/testdata/sortlist-v4.conf +++ b/lib/irs/tests/testdata/sortlist-v4.conf @@ -1 +1,7 @@ +# 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/. + 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..3e50be72af 100644 --- a/lib/irs/tests/testdata/timeout.conf +++ b/lib/irs/tests/testdata/timeout.conf @@ -1 +1,7 @@ +# 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/. + timeout 10 diff --git a/lib/irs/tests/testdata/unknown.conf b/lib/irs/tests/testdata/unknown.conf index 27ceb3e0e7..c5d5530cfa 100644 --- a/lib/irs/tests/testdata/unknown.conf +++ b/lib/irs/tests/testdata/unknown.conf @@ -1 +1,7 @@ +# 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/. + unknown directive diff --git a/util/copyrights b/util/copyrights index 0263debb9a..ef10f692e6 100644 --- a/util/copyrights +++ b/util/copyrights @@ -3961,6 +3961,7 @@ ./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,2016 ./lib/dns/zt.c C 1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013,2014,2015,2016 +./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,2016 ./lib/irs/context.c C 2009,2014,2016 @@ -3978,6 +3979,23 @@ ./lib/irs/include/irs/types.h C 2009,2016 ./lib/irs/include/irs/version.h C 2009,2016 ./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,2016 ./lib/irs/win32/DLLMain.c C 2014,2016 ./lib/irs/win32/Makefile.in MAKE 2014,2016