copyrights

diff --git a/CHANGES b/CHANGES
index 17b58805f6e4b6ce12080f0aec3e7af7ee442942..589730be53b42b2484b7342da4b09b31f530c4e2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -44,7 +44,7 @@
                        'root-key-sentinel no;' to named.conf. [GL #37]
 
 4922.  [bug]           dnstap: Log the destination address of client
-                       packets rather than the interface address. 
+                       packets rather than the interface address.
                        [GL #197]
 
 4921.  [cleanup]       Add dns_fixedname_initname() and refactor the caller

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index f5e9b1b75161a0a5ba016700f94afa3b930e07d4..8f9bbac825afbceac6ef6c5c43608460f830b86b 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1051,7 +1051,7 @@ plus_option(const char *option, isc_boolean_t is_batchfile,
                                        FULLCHECK("idnin");
 #ifndef WITH_IDN_SUPPORT
                                        fprintf(stderr, ";; IDN input support"
-                                               " not enabled\n");
+                                               " not enabled\n");
 #else
                                        lookup->idnin = state;
 #endif
@@ -1060,7 +1060,7 @@ plus_option(const char *option, isc_boolean_t is_batchfile,
                                        FULLCHECK("idnout");
 #ifndef WITH_IDN_OUT_SUPPORT
                                        fprintf(stderr, ";; IDN output support"
-                                               " not enabled\n");
+                                               " not enabled\n");
 #else
                                        lookup->idnout = state;
 #endif

diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 4691726a093d22fb70a389dde8e793e0be3e0f73..d4e1008584cdc3b84542c312c4356b6f10c956bb 100644 (file)
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -1305,7 +1305,7 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
       <command>dig</command> appropriately converts character encoding of
       domain name before sending a request to DNS server or displaying a
       reply from the server.
-      If you'd like to turn off the IDN support for some reason, use 
+      If you'd like to turn off the IDN support for some reason, use
       parameters <parameter>+noidnin</parameter> and
       <parameter>+noidnout</parameter>.
     </para>

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 6e4c609f596db1567a19d23cda8ad57d7273001b..bb21bb3c0039ef60af847b3c5f02b42e2ece287f 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -4313,12 +4313,12 @@ idn_locale_to_ace(const char *from, char *to, size_t tolen) {
        idn_result_t result;
 
        result = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, from,
-                               utf8_textname, sizeof(utf8_textname));
+                               utf8_textname, sizeof(utf8_textname));
        idnkit_check_result(result, "idnkit idn_encodename to utf8 failed");
 
        result = idn_encodename(idnoptions | IDN_LOCALMAP | IDN_NAMEPREP |
-                               IDN_IDNCONV | IDN_LENCHECK,
-                               utf8_textname, to, tolen);
+                               IDN_IDNCONV | IDN_LENCHECK,
+                               utf8_textname, to, tolen);
        idnkit_check_result(result, "idnkit idn_encodename to idn failed");
        return (ISC_R_SUCCESS);
 }

diff --git a/bin/tests/system/rootkeysentinel/ns3/hint.db b/bin/tests/system/rootkeysentinel/ns3/hint.db
index bcd3e4b7f13d906a3f537858278180caaaf01dd6..4a7363741b7f6efa552a7f4e95a0d3b7fcf59b43 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns3/hint.db
+++ b/bin/tests/system/rootkeysentinel/ns3/hint.db
@@ -1,2 +1,11 @@
+; Copyright (C) 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/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 .                       NS      a.root-servers.nil.
 a.root-servers.nil.     A       10.53.0.1

diff --git a/bin/tests/system/rootkeysentinel/ns4/hint.db b/bin/tests/system/rootkeysentinel/ns4/hint.db
index bcd3e4b7f13d906a3f537858278180caaaf01dd6..4a7363741b7f6efa552a7f4e95a0d3b7fcf59b43 100644 (file)
--- a/bin/tests/system/rootkeysentinel/ns4/hint.db
+++ b/bin/tests/system/rootkeysentinel/ns4/hint.db
@@ -1,2 +1,11 @@
+; Copyright (C) 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/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 .                       NS      a.root-servers.nil.
 a.root-servers.nil.     A       10.53.0.1

diff --git a/doc/design/db_rules b/doc/design/db_rules
index e6335da6f6c71c6a2d6d3e8214a653966e751f76..ef4de0e0f7c7e475e06eca0e803594a385faeb74 100644 (file)
--- a/doc/design/db_rules
+++ b/doc/design/db_rules
@@ -6,7 +6,6 @@ Here is a more formal statement of the important database design
 rules.  Each rule has a 5 character mnemonic, for use in source code
 comments.
 
-
 Reference Safety                                               [DBREF]
 
        1)      Any node reference retrieved from the database shall remain

diff --git a/doc/dev/tests b/doc/dev/tests
index e1d31efdddbc927b8a333f319a42dd6e8a8123d0..5cccc28a8fbe5cbf93731234f1c16c2f694a3aca 100644 (file)
--- a/doc/dev/tests
+++ b/doc/dev/tests
@@ -5,7 +5,6 @@ See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 We do hourly test builds of the bind9 tree.  This is an attempt to
 document how they work.
 
-
 * How things work
 
 The scripts driving the build system are in ~wpk/b9t.  They are now

diff --git a/lib/dns/tests/sigs_test.c b/lib/dns/tests/sigs_test.c
index da885620b7150dae44985f1837405bf638b3d058..6fb4055eed672997a4c333a7baa18d80caa36aaf 100644 (file)
--- a/lib/dns/tests/sigs_test.c
+++ b/lib/dns/tests/sigs_test.c
@@ -460,11 +460,11 @@ ATF_TC_BODY(updatesigs, tc) {
 #else
 ATF_TC(untested);
 ATF_TC_HEAD(untested, tc) {
-        atf_tc_set_md_var(tc, "descr", "skipping dns__zone_updatesigs() test");
+       atf_tc_set_md_var(tc, "descr", "skipping dns__zone_updatesigs() test");
 }
 ATF_TC_BODY(untested, tc) {
-        UNUSED(tc);
-        atf_tc_skip("DNSSEC support not compiled in");
+       UNUSED(tc);
+       atf_tc_skip("DNSSEC support not compiled in");
 }
 #endif
 

diff --git a/lib/ns/query.c b/lib/ns/query.c
index 67ec150a1781d370ceb2d47d31f03fb3c8acc456..86e368732f2d706d0f898d6343dac67bd561e4f3 100644 (file)
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -5170,7 +5170,7 @@ root_key_sentinel_detect(query_ctx_t *qctx) {
                              NS_LOGMODULE_QUERY, ISC_LOG_INFO,
                              "root-key-sentinel-is-ta query label found");
        } else if (qctx->client->query.qname->length > 31 && ndata[0] == 30 &&
-                  strncasecmp(ndata + 1, "root-key-sentinel-not-ta-", 25) == 0)
+                  strncasecmp(ndata + 1, "root-key-sentinel-not-ta-", 25) == 0)
        {
                if (!get_root_key_sentinel_id(qctx, ndata + 26)) {
                        return;

diff --git a/util/copyrights b/util/copyrights
index cd0268c29a5d3d33d626e902ea4c92125e9de281..b94998a6ca932f06b52d081be838b6627451f22d 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1375,10 +1375,8 @@
 ./bin/tests/system/gost/setup.sh               SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/gost/tests.sh               SH      2010,2012,2013,2016,2018
 ./bin/tests/system/idna/clean.sh               SH      2018
-./bin/tests/system/idna/ns1/named.conf         CONF-C  2018
 ./bin/tests/system/idna/ns1/named.conf.in      CONF-C  2018
 ./bin/tests/system/idna/ns1/root.db            ZONE    2018
-./bin/tests/system/idna/prereq.sh              SH      2018
 ./bin/tests/system/idna/setup.sh               SH      2018
 ./bin/tests/system/idna/tests.sh               SH      2018
 ./bin/tests/system/ifconfig.bat                        BAT     2016,2018
@@ -2975,6 +2973,7 @@
 ./doc/arm/notes.conf                           X       2015,2018
 ./doc/arm/notes.html                           X       2014,2015,2016,2017,2018
 ./doc/arm/notes.pdf                            X       2014,2015,2016,2017,2018
+./doc/arm/notes.txt                            X       2018
 ./doc/arm/notes.xml                            SGML    2014,2015,2016,2017,2018
 ./doc/arm/noteversion.xml.in                   SGML    2015,2016,2018
 ./doc/arm/options.grammar.xml                  SGML    2018
@@ -3498,7 +3497,6 @@
 ./lib/dns/tests/dnstest.c                      C       2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/tests/dnstest.h                      C       2011,2012,2014,2015,2016,2017,2018
 ./lib/dns/tests/dst_test.c                     C       2018
-./lib/dns/tests/dstrandom_test.c               C       2017,2018
 ./lib/dns/tests/geoip_test.c                   C       2013,2014,2015,2016,2017,2018
 ./lib/dns/tests/gost_test.c                    C       2014,2015,2016,2017,2018
 ./lib/dns/tests/keytable_test.c                        C       2014,2015,2016,2017,2018
@@ -3669,7 +3667,6 @@
 ./lib/isc/bind9.c                              C       2013,2016,2018
 ./lib/isc/buffer.c                             C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2012,2014,2015,2016,2017,2018
 ./lib/isc/bufferlist.c                         C       1999,2000,2001,2004,2005,2007,2016,2018
-./lib/isc/chacha_private.h                     X       2014,2018
 ./lib/isc/commandline.c                                C.PORTION       1999,2000,2001,2004,2005,2007,2008,2014,2015,2016,2018
 ./lib/isc/counter.c                            C       2014,2016,2018
 ./lib/isc/crc64.c                              C       2013,2016,2018