From: Evan Hunt Date: Thu, 12 Oct 2017 04:11:37 +0000 (-0700) Subject: [master] copyrights X-Git-Tag: v9.12.0b1~15 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=d0c3272eaaf2ac38985a2ca4167e3e2ebbd2bff6;p=thirdparty%2Fbind9.git [master] copyrights --- diff --git a/bin/tests/system/mkeys/clean.sh b/bin/tests/system/mkeys/clean.sh index 76e654c64f6..8c3e33c71dc 100644 --- a/bin/tests/system/mkeys/clean.sh +++ b/bin/tests/system/mkeys/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2015, 2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 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/mkeys/ns1/named1.conf b/bin/tests/system/mkeys/ns1/named1.conf index 31afb8e1d2b..5f9eeaf91e0 100644 --- a/bin/tests/system/mkeys/ns1/named1.conf +++ b/bin/tests/system/mkeys/ns1/named1.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 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/mkeys/ns1/named2.conf b/bin/tests/system/mkeys/ns1/named2.conf index 19ef0cb7015..42f6712859b 100644 --- a/bin/tests/system/mkeys/ns1/named2.conf +++ b/bin/tests/system/mkeys/ns1/named2.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 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/runtime/ns2/named-alt2.conf b/bin/tests/system/runtime/ns2/named-alt2.conf index 0e0864a58b4..aaca67dd7e5 100644 --- a/bin/tests/system/runtime/ns2/named-alt2.conf +++ b/bin/tests/system/runtime/ns2/named-alt2.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 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/tests/system/runtime/ns2/named-alt3.conf b/bin/tests/system/runtime/ns2/named-alt3.conf index 4353284f99f..b5ad8473398 100644 --- a/bin/tests/system/runtime/ns2/named-alt3.conf +++ b/bin/tests/system/runtime/ns2/named-alt3.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 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/runtime/ns2/named-alt4.conf b/bin/tests/system/runtime/ns2/named-alt4.conf index 12fd87fb9c7..c1da2fed59c 100644 --- a/bin/tests/system/runtime/ns2/named-alt4.conf +++ b/bin/tests/system/runtime/ns2/named-alt4.conf @@ -7,10 +7,10 @@ */ options { - directory "./nope"; - port 5300; - pid-file "../named.pid"; - listen-on { 127.0.0.1; }; - listen-on-v6 { none; }; - recursion no; + directory "./nope"; + port 5300; + pid-file "../named.pid"; + listen-on { 127.0.0.1; }; + listen-on-v6 { none; }; + recursion no; }; diff --git a/bin/tests/system/runtime/ns2/named-alt5.conf b/bin/tests/system/runtime/ns2/named-alt5.conf index 3b179425d0c..8b60f58e9ad 100644 --- a/bin/tests/system/runtime/ns2/named-alt5.conf +++ b/bin/tests/system/runtime/ns2/named-alt5.conf @@ -8,9 +8,9 @@ options { managed-keys-directory "./nope"; - port 5300; - pid-file "../named.pid"; - listen-on { 127.0.0.1; }; - listen-on-v6 { none; }; - recursion no; + port 5300; + pid-file "../named.pid"; + listen-on { 127.0.0.1; }; + listen-on-v6 { none; }; + recursion no; }; diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h index baf9ad0a78e..ff88c8c6801 100644 --- a/lib/dns/include/dns/keytable.h +++ b/lib/dns/include/dns/keytable.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2010, 2014-2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2010, 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/lib/dns/keytable.c b/lib/dns/keytable.c index 1421330c701..9c5e53d8672 100644 --- a/lib/dns/keytable.c +++ b/lib/dns/keytable.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2010, 2013-2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2010, 2013-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/dns/tests/keytable_test.c b/lib/dns/tests/keytable_test.c index 23ba2922073..7f5c3850825 100644 --- a/lib/dns/tests/keytable_test.c +++ b/lib/dns/tests/keytable_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 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/lib/dns/zone.c b/lib/dns/zone.c index 3ca053adbdb..80d9481fedf 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -9484,9 +9484,9 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) { keytag, namebuf, initial ? "initializing key " - "verified" + "verified" : "acceptance timer " - "complete"); + "complete"); } } else if (keydata.addhd > now) { /* diff --git a/util/copyrights b/util/copyrights index 655e411152f..216e003c7e2 100644 --- a/util/copyrights +++ b/util/copyrights @@ -1703,15 +1703,17 @@ ./bin/tests/system/metadata/setup.sh SH 2009,2011,2012,2014,2016,2017 ./bin/tests/system/metadata/tests.sh SH 2009,2011,2012,2013,2014,2016,2017 ./bin/tests/system/mkeys/README TXT.BRIEF 2015,2016,2017 -./bin/tests/system/mkeys/clean.sh SH 2015,2016 -./bin/tests/system/mkeys/ns1/named1.conf CONF-C 2015,2016 -./bin/tests/system/mkeys/ns1/named2.conf CONF-C 2015,2016 +./bin/tests/system/mkeys/clean.sh SH 2015,2016,2017 +./bin/tests/system/mkeys/ns1/named1.conf CONF-C 2015,2016,2017 +./bin/tests/system/mkeys/ns1/named2.conf CONF-C 2015,2016,2017 ./bin/tests/system/mkeys/ns1/root.db ZONE 2015,2016 ./bin/tests/system/mkeys/ns1/sign.sh SH 2015,2016,2017 -./bin/tests/system/mkeys/ns2/named.args X 2015,2016 +./bin/tests/system/mkeys/ns2/named.args X 2015,2016,2017 ./bin/tests/system/mkeys/ns2/named.conf CONF-C 2015,2016 ./bin/tests/system/mkeys/ns3/named.args X 2015,2016 ./bin/tests/system/mkeys/ns3/named.conf CONF-C 2015,2016 +./bin/tests/system/mkeys/ns4/named.conf CONF-C 2017 +./bin/tests/system/mkeys/ns5/named.conf CONF-C 2017 ./bin/tests/system/mkeys/prereq.sh SH 2015,2016 ./bin/tests/system/mkeys/setup.sh SH 2015,2016,2017 ./bin/tests/system/mkeys/tests.sh SH 2015,2016,2017 @@ -2103,8 +2105,8 @@ ./bin/tests/system/runtime/README TXT.BRIEF 2014,2016 ./bin/tests/system/runtime/clean.sh SH 2014,2015,2016,2017 ./bin/tests/system/runtime/ns2/named-alt1.conf CONF-C 2014,2016 -./bin/tests/system/runtime/ns2/named-alt2.conf CONF-C 2014,2016 -./bin/tests/system/runtime/ns2/named-alt3.conf CONF-C 2015,2016 +./bin/tests/system/runtime/ns2/named-alt2.conf CONF-C 2014,2016,2017 +./bin/tests/system/runtime/ns2/named-alt3.conf CONF-C 2015,2016,2017 ./bin/tests/system/runtime/ns2/named-alt4.conf CONF-C 2017 ./bin/tests/system/runtime/ns2/named-alt5.conf CONF-C 2017 ./bin/tests/system/runtime/ns2/named1.conf CONF-C 2017 @@ -3284,7 +3286,7 @@ ./lib/dns/include/dns/journal.h C 1999,2000,2001,2004,2005,2006,2007,2008,2009,2011,2013,2016,2017 ./lib/dns/include/dns/keydata.h C 2009,2016 ./lib/dns/include/dns/keyflags.h C 1999,2000,2001,2004,2005,2006,2007,2016 -./lib/dns/include/dns/keytable.h C 2000,2001,2004,2005,2007,2009,2010,2014,2015,2016 +./lib/dns/include/dns/keytable.h C 2000,2001,2004,2005,2007,2009,2010,2014,2015,2016,2017 ./lib/dns/include/dns/keyvalues.h C 1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2012,2016,2017 ./lib/dns/include/dns/lib.h C 1999,2000,2001,2004,2005,2006,2007,2009,2016,2017 ./lib/dns/include/dns/librpz.h C 2017 @@ -3352,7 +3354,7 @@ ./lib/dns/journal.c C 1999,2000,2001,2002,2004,2005,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017 ./lib/dns/key.c C 2001,2004,2005,2006,2007,2011,2016 ./lib/dns/keydata.c C 2009,2014,2016 -./lib/dns/keytable.c C 2000,2001,2004,2005,2007,2009,2010,2013,2014,2015,2016 +./lib/dns/keytable.c C 2000,2001,2004,2005,2007,2009,2010,2013,2014,2015,2016,2017 ./lib/dns/lib.c C 1999,2000,2001,2004,2005,2007,2009,2013,2014,2015,2016,2017 ./lib/dns/log.c C 1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2015,2016,2017 ./lib/dns/lookup.c C 2000,2001,2003,2004,2005,2007,2013,2016 @@ -3589,7 +3591,7 @@ ./lib/dns/tests/dstrandom_test.c C 2017 ./lib/dns/tests/geoip_test.c C 2013,2014,2015,2016,2017 ./lib/dns/tests/gost_test.c C 2014,2015,2016,2017 -./lib/dns/tests/keytable_test.c C 2014,2015,2016 +./lib/dns/tests/keytable_test.c C 2014,2015,2016,2017 ./lib/dns/tests/master_test.c C 2011,2012,2013,2015,2016,2017 ./lib/dns/tests/mkraw.pl PERL 2011,2012,2016 ./lib/dns/tests/name_test.c C 2014,2015,2016,2017