From 9c2cf9e2017e6dd196e3b866808f32c6206eeedc Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 11 Jun 2014 10:28:09 +1000 Subject: [PATCH] update copyrights --- bin/tests/system/checknames/clean.sh | 2 +- .../checknames/ns4/master-ignore.update.db.in | 2 +- bin/tests/system/checknames/ns4/named.conf | 20 +++++++++---------- bin/tests/system/checknames/ns4/root.hints | 2 +- bin/tests/system/checknames/setup.sh | 2 +- bin/tests/system/checknames/tests.sh | 2 +- bin/tests/system/spf/tests.sh | 2 +- util/copyrights | 11 ++++++---- 8 files changed, 23 insertions(+), 20 deletions(-) diff --git a/bin/tests/system/checknames/clean.sh b/bin/tests/system/checknames/clean.sh index 84fd45777f..2ab3daf95e 100644 --- a/bin/tests/system/checknames/clean.sh +++ b/bin/tests/system/checknames/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2012, 2014 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/checknames/ns4/master-ignore.update.db.in b/bin/tests/system/checknames/ns4/master-ignore.update.db.in index 18826bd3d2..adb360a532 100644 --- a/bin/tests/system/checknames/ns4/master-ignore.update.db.in +++ b/bin/tests/system/checknames/ns4/master-ignore.update.db.in @@ -1,4 +1,4 @@ -; Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2014 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/checknames/ns4/named.conf b/bin/tests/system/checknames/ns4/named.conf index 3c5e9d7db2..9ada8739ea 100644 --- a/bin/tests/system/checknames/ns4/named.conf +++ b/bin/tests/system/checknames/ns4/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2014 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 @@ -19,17 +19,17 @@ controls { /* empty */ }; 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 yes; + 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 yes; acache-enable yes; check-names master ignore; - notify yes; + notify yes; }; zone "." { diff --git a/bin/tests/system/checknames/ns4/root.hints b/bin/tests/system/checknames/ns4/root.hints index 712002bf8a..3676283eeb 100644 --- a/bin/tests/system/checknames/ns4/root.hints +++ b/bin/tests/system/checknames/ns4/root.hints @@ -1,4 +1,4 @@ -; Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2014 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/checknames/setup.sh b/bin/tests/system/checknames/setup.sh index 3634ebfbb3..3fea32aa3d 100644 --- a/bin/tests/system/checknames/setup.sh +++ b/bin/tests/system/checknames/setup.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2012, 2014 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/checknames/tests.sh b/bin/tests/system/checknames/tests.sh index 84f3379414..2b4f07c667 100644 --- a/bin/tests/system/checknames/tests.sh +++ b/bin/tests/system/checknames/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007, 2012, 2013 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2012-2014 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/spf/tests.sh b/bin/tests/system/spf/tests.sh index 3da6e2ec69..ba8ddd4239 100644 --- a/bin/tests/system/spf/tests.sh +++ b/bin/tests/system/spf/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2013, 2014 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/util/copyrights b/util/copyrights index f3b2b167d4..b9e64c13f4 100644 --- a/util/copyrights +++ b/util/copyrights @@ -911,7 +911,7 @@ ./bin/tests/system/checkds/wrong.example.dlv.example.dlv.db X 2012 ./bin/tests/system/checkds/wrong.example.dnskey.db X 2012 ./bin/tests/system/checkds/wrong.example.ds.db X 2012 -./bin/tests/system/checknames/clean.sh SH 2004,2007,2012 +./bin/tests/system/checknames/clean.sh SH 2004,2007,2012,2014 ./bin/tests/system/checknames/ns1/fail.example.db.in ZONE 2004,2007 ./bin/tests/system/checknames/ns1/fail.update.db.in ZONE 2004,2007 ./bin/tests/system/checknames/ns1/ignore.example.db.in ZONE 2004,2007 @@ -924,8 +924,11 @@ ./bin/tests/system/checknames/ns2/root.hints ZONE 2004,2007 ./bin/tests/system/checknames/ns3/named.conf CONF-C 2004,2007 ./bin/tests/system/checknames/ns3/root.hints ZONE 2004,2007 -./bin/tests/system/checknames/setup.sh SH 2004,2007,2012 -./bin/tests/system/checknames/tests.sh SH 2004,2007,2012,2013 +./bin/tests/system/checknames/ns4/master-ignore.update.db.in ZONE 2014 +./bin/tests/system/checknames/ns4/named.conf CONF-C 2014 +./bin/tests/system/checknames/ns4/root.hints ZONE 2014 +./bin/tests/system/checknames/setup.sh SH 2004,2007,2012,2014 +./bin/tests/system/checknames/tests.sh SH 2004,2007,2012,2013,2014 ./bin/tests/system/checkzone/clean.sh SH 2011,2012,2013,2014 ./bin/tests/system/checkzone/setup.sh SH 2014 ./bin/tests/system/checkzone/tests.sh SH 2011,2012,2013,2014 @@ -1710,7 +1713,7 @@ ./bin/tests/system/spf/clean.sh SH 2013 ./bin/tests/system/spf/ns1/named.conf CONF-C 2013 ./bin/tests/system/spf/ns1/spf.db ZONE 2013 -./bin/tests/system/spf/tests.sh SH 2013 +./bin/tests/system/spf/tests.sh SH 2013,2014 ./bin/tests/system/start.pl SH 2001,2004,2005,2006,2007,2008,2010,2011,2012,2013 ./bin/tests/system/start.sh SH 2000,2001,2004,2007,2012 ./bin/tests/system/staticstub/clean.sh SH 2010,2012,2014