From 61c843815e7d23110e089b45ab4be270bc2a415d Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Thu, 30 Nov 2017 14:51:50 -0800 Subject: [PATCH] [master] copyrights/whitespace --- bin/tests/atomic/t_atomic.c | 2 +- bin/tests/system/acl/clean.sh | 2 +- bin/tests/system/acl/ns3/example.db | 6 +++++ bin/tests/system/acl/ns3/named.conf | 36 +++++++++++++++---------- bin/tests/system/acl/ns4/example.db | 6 +++++ bin/tests/system/acl/ns4/existing.db | 6 +++++ bin/tests/system/acl/ns4/named.conf | 40 +++++++++++++++++----------- bin/tests/system/acl/tests.sh | 2 +- bin/tools/named-nzd2nzf.c | 2 +- lib/isc/event.c | 2 +- lib/isc/portset.c | 2 +- util/copyrights | 17 +++++++----- 12 files changed, 81 insertions(+), 42 deletions(-) diff --git a/bin/tests/atomic/t_atomic.c b/bin/tests/atomic/t_atomic.c index 4f5337dd7f..299ff0b259 100644 --- a/bin/tests/atomic/t_atomic.c +++ b/bin/tests/atomic/t_atomic.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2013, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2011, 2013, 2015-2017 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/bin/tests/system/acl/clean.sh b/bin/tests/system/acl/clean.sh index 5e8f874246..508b807061 100644 --- a/bin/tests/system/acl/clean.sh +++ b/bin/tests/system/acl/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2008, 2012, 2014-2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2008, 2012, 2014-2017 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/bin/tests/system/acl/ns3/example.db b/bin/tests/system/acl/ns3/example.db index 316f1011b9..6ce4cc6af3 100644 --- a/bin/tests/system/acl/ns3/example.db +++ b/bin/tests/system/acl/ns3/example.db @@ -1,3 +1,9 @@ +; Copyright (C) 2017 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/. + $TTL 300 ; 5 minutes @ IN SOA ns root ( 2000082401 ; serial diff --git a/bin/tests/system/acl/ns3/named.conf b/bin/tests/system/acl/ns3/named.conf index 2e05b387c4..a1531386ec 100644 --- a/bin/tests/system/acl/ns3/named.conf +++ b/bin/tests/system/acl/ns3/named.conf @@ -1,22 +1,30 @@ +/* + * Copyright (C) 2017 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 { - query-source address 10.53.0.3; - notify-source 10.53.0.3; - transfer-source 10.53.0.3; - port 5300; - pid-file "named.pid"; - listen-on { 10.53.0.3; }; - listen-on-v6 { none; }; - recursion no; - notify no; - allow-new-zones yes; - allow-transfer { none; }; + query-source address 10.53.0.3; + notify-source 10.53.0.3; + transfer-source 10.53.0.3; + port 5300; + pid-file "named.pid"; + listen-on { 10.53.0.3; }; + listen-on-v6 { none; }; + recursion no; + notify no; + allow-new-zones yes; + allow-transfer { none; }; }; controls { - inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; diff --git a/bin/tests/system/acl/ns4/example.db b/bin/tests/system/acl/ns4/example.db index f2dfbd89a0..cb4d2f1047 100644 --- a/bin/tests/system/acl/ns4/example.db +++ b/bin/tests/system/acl/ns4/example.db @@ -1,3 +1,9 @@ +; Copyright (C) 2017 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/. + $TTL 300 ; 5 minutes @ IN SOA ns root ( 2000082401 ; serial diff --git a/bin/tests/system/acl/ns4/existing.db b/bin/tests/system/acl/ns4/existing.db index f2dfbd89a0..cb4d2f1047 100644 --- a/bin/tests/system/acl/ns4/existing.db +++ b/bin/tests/system/acl/ns4/existing.db @@ -1,3 +1,9 @@ +; Copyright (C) 2017 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/. + $TTL 300 ; 5 minutes @ IN SOA ns root ( 2000082401 ; serial diff --git a/bin/tests/system/acl/ns4/named.conf b/bin/tests/system/acl/ns4/named.conf index eedc55b147..9bc07ab06b 100644 --- a/bin/tests/system/acl/ns4/named.conf +++ b/bin/tests/system/acl/ns4/named.conf @@ -1,27 +1,35 @@ +/* + * Copyright (C) 2017 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 { - query-source address 10.53.0.4; - notify-source 10.53.0.4; - transfer-source 10.53.0.4; - port 5300; - pid-file "named.pid"; - listen-on { 10.53.0.4; }; - listen-on-v6 { none; }; - recursion no; - notify no; - allow-new-zones yes; - allow-transfer { none; }; + query-source address 10.53.0.4; + notify-source 10.53.0.4; + transfer-source 10.53.0.4; + port 5300; + pid-file "named.pid"; + listen-on { 10.53.0.4; }; + listen-on-v6 { none; }; + recursion no; + notify no; + allow-new-zones yes; + allow-transfer { none; }; }; controls { - inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.4 port 9953 allow { any; } keys { rndc_key; }; }; key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; + secret "1234abcd8765"; + algorithm hmac-sha256; }; zone "existing" { - type master; - file "existing.db"; + type master; + file "existing.db"; }; diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh index 1fe17d564c..18ee1ebe84 100644 --- a/bin/tests/system/acl/tests.sh +++ b/bin/tests/system/acl/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2008, 2012-2014, 2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2008, 2012-2014, 2016, 2017 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/bin/tools/named-nzd2nzf.c b/bin/tools/named-nzd2nzf.c index 0c24b49def..e502607f5b 100644 --- a/bin/tools/named-nzd2nzf.c +++ b/bin/tools/named-nzd2nzf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2016, 2017 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/isc/event.c b/lib/isc/event.c index a369d7f6cb..e1175256f1 100644 --- a/lib/isc/event.c +++ b/lib/isc/event.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-2001, 2004, 2005, 2007, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1998-2001, 2004, 2005, 2007, 2014, 2016, 2017 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/isc/portset.c b/lib/isc/portset.c index a5843c1013..c7208548ed 100644 --- a/lib/isc/portset.c +++ b/lib/isc/portset.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2008, 2016, 2017 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/util/copyrights b/util/copyrights index 75f4ef0700..e4da92b1cb 100644 --- a/util/copyrights +++ b/util/copyrights @@ -333,7 +333,7 @@ ./bin/tests/Makefile.in MAKE 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./bin/tests/adb_test.c C 1999,2000,2001,2004,2005,2007,2009,2011,2012,2013,2015,2016 ./bin/tests/atomic/Makefile.in MAKE 2011,2012,2014,2016,2017 -./bin/tests/atomic/t_atomic.c C 2011,2013,2015,2016 +./bin/tests/atomic/t_atomic.c C 2011,2013,2015,2016,2017 ./bin/tests/atomic/win32/t_atomic.vcxproj.filters.in X 2013,2015 ./bin/tests/atomic/win32/t_atomic.vcxproj.in X 2013,2015,2016,2017 ./bin/tests/atomic/win32/t_atomic.vcxproj.user X 2013 @@ -616,7 +616,7 @@ ./bin/tests/system/.gitignore X 2012,2016 ./bin/tests/system/Makefile.in MAKE 2000,2001,2004,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017 ./bin/tests/system/README TXT.BRIEF 2000,2001,2004,2010,2011,2013,2015,2016,2017 -./bin/tests/system/acl/clean.sh SH 2008,2012,2014,2015,2016 +./bin/tests/system/acl/clean.sh SH 2008,2012,2014,2015,2016,2017 ./bin/tests/system/acl/ns2/named1.conf CONF-C 2008,2016 ./bin/tests/system/acl/ns2/named2.conf CONF-C 2008,2016 ./bin/tests/system/acl/ns2/named3.conf CONF-C 2008,2016 @@ -624,8 +624,13 @@ ./bin/tests/system/acl/ns2/named5.conf CONF-C 2013,2016 ./bin/tests/system/acl/ns2/named6.conf CONF-C 2014,2016 ./bin/tests/system/acl/ns2/named7.conf CONF-C 2014,2016 +./bin/tests/system/acl/ns3/example.db ZONE 2017 +./bin/tests/system/acl/ns3/named.conf CONF-C 2017 +./bin/tests/system/acl/ns4/example.db ZONE 2017 +./bin/tests/system/acl/ns4/existing.db ZONE 2017 +./bin/tests/system/acl/ns4/named.conf CONF-C 2017 ./bin/tests/system/acl/setup.sh SH 2008,2012,2014,2016 -./bin/tests/system/acl/tests.sh SH 2008,2012,2013,2014,2016 +./bin/tests/system/acl/tests.sh SH 2008,2012,2013,2014,2016,2017 ./bin/tests/system/additional/clean.sh SH 2013,2014,2016,2017 ./bin/tests/system/additional/ns1/mx.db ZONE 2016 ./bin/tests/system/additional/ns1/named.args X 2013,2014 @@ -2577,7 +2582,7 @@ ./bin/tools/named-journalprint.docbook SGML 2009,2014,2015,2016,2017 ./bin/tools/named-journalprint.html HTML DOCBOOK ./bin/tools/named-nzd2nzf.8 MAN DOCBOOK -./bin/tools/named-nzd2nzf.c C 2016 +./bin/tools/named-nzd2nzf.c C 2016,2017 ./bin/tools/named-nzd2nzf.docbook SGML 2016 ./bin/tools/named-nzd2nzf.html HTML DOCBOOK ./bin/tools/named-rrchecker.1 MAN DOCBOOK @@ -3745,7 +3750,7 @@ ./lib/isc/crc64.c C 2013,2016 ./lib/isc/entropy.c C 2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2014,2015,2016,2017 ./lib/isc/error.c C 1998,1999,2000,2001,2004,2005,2007,2015,2016 -./lib/isc/event.c C 1998,1999,2000,2001,2004,2005,2007,2014,2016 +./lib/isc/event.c C 1998,1999,2000,2001,2004,2005,2007,2014,2016,2017 ./lib/isc/fsaccess.c C 2000,2001,2004,2005,2007,2016,2017 ./lib/isc/hash.c C 2003,2004,2005,2006,2007,2009,2013,2014,2015,2016,2017 ./lib/isc/heap.c C 1997,1998,1999,2000,2001,2004,2005,2006,2007,2010,2011,2012,2013,2014,2015,2016,2017 @@ -3898,7 +3903,7 @@ ./lib/isc/pk11.c C 2014,2015,2016,2017 ./lib/isc/pk11_result.c C 2014,2015,2016 ./lib/isc/pool.c C 2013,2015,2016 -./lib/isc/portset.c C 2008,2016 +./lib/isc/portset.c C 2008,2016,2017 ./lib/isc/powerpc/Makefile.in MAKE 2007,2012,2016 ./lib/isc/powerpc/include/Makefile.in MAKE 2007,2012,2016 ./lib/isc/powerpc/include/isc/Makefile.in MAKE 2007,2012,2015,2016