update copyright notice / whitespace

diff --git a/bin/tests/system/serve-stale/ans2/ans.pl b/bin/tests/system/serve-stale/ans2/ans.pl
index 2c3dfa711fec4a786d28b32f1fdaa8dc36ee88fc..9f95460dbf450c6ac0035a1c1ee4f8d24cb76327 100644 (file)
--- a/bin/tests/system/serve-stale/ans2/ans.pl
+++ b/bin/tests/system/serve-stale/ans2/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# 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

diff --git a/bin/tests/system/serve-stale/clean.sh b/bin/tests/system/serve-stale/clean.sh
index 754158e60c2f432ec5e68fd5b133b564941041b0..15e23bb343221eb134f7c97f80c4a029811adc14 100644 (file)
--- a/bin/tests/system/serve-stale/clean.sh
+++ b/bin/tests/system/serve-stale/clean.sh
@@ -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/.
+
 rm -f dig.out.test*
 rm -f ns1/named.conf
 rm -f ns3/root.bk

diff --git a/bin/tests/system/serve-stale/ns1/named1.conf b/bin/tests/system/serve-stale/ns1/named1.conf
index 0e924e64b4f827df038ad95392ca6790ae8ffd8c..21fc39900dca31f8ab8eda9e793d09a2570901e0 100644 (file)
--- a/bin/tests/system/serve-stale/ns1/named1.conf
+++ b/bin/tests/system/serve-stale/ns1/named1.conf
@@ -7,12 +7,12 @@
  */
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-sha256;
+       secret "1234abcd8765";
+       algorithm hmac-sha256;
 };
 
 controls {
-        inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
+       inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
 };
 
 options {

diff --git a/bin/tests/system/serve-stale/ns1/named2.conf b/bin/tests/system/serve-stale/ns1/named2.conf
index df6077ff9f8e170f73e7ff2dde3219fdcce7c5ad..a481fd8a99105c74233713e9aa58fb7c979ee19c 100644 (file)
--- a/bin/tests/system/serve-stale/ns1/named2.conf
+++ b/bin/tests/system/serve-stale/ns1/named2.conf
@@ -7,12 +7,12 @@
  */
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-sha256;
+       secret "1234abcd8765";
+       algorithm hmac-sha256;
 };
 
 controls {
-        inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
+       inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
 };
 
 options {

diff --git a/bin/tests/system/serve-stale/ns1/root.db b/bin/tests/system/serve-stale/ns1/root.db
index eb9ad3ecf11d31143604e73bb87a26d07621f150..a865fe0c3a9553de82c7709563ab3f4032da4df5 100644 (file)
--- a/bin/tests/system/serve-stale/ns1/root.db
+++ b/bin/tests/system/serve-stale/ns1/root.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/.
+
 .              300     SOA     . . 0 0 0 0 0
 .              300     NS      ns.nil.
 ns.nil.                300     A       10.53.0.1

diff --git a/bin/tests/system/serve-stale/ns3/named.conf b/bin/tests/system/serve-stale/ns3/named.conf
index 361f10aff3116f7351c3a7af5c0b8a98a719ec30..88bd08ce478a79883da363558b93783b360b0b68 100644 (file)
--- a/bin/tests/system/serve-stale/ns3/named.conf
+++ b/bin/tests/system/serve-stale/ns3/named.conf
@@ -7,12 +7,12 @@
  */
 
 key rndc_key {
-        secret "1234abcd8765";
-        algorithm hmac-sha256;
+       secret "1234abcd8765";
+       algorithm hmac-sha256;
 };
 
 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; };
 };
 
 options {

diff --git a/bin/tests/system/serve-stale/setup.sh b/bin/tests/system/serve-stale/setup.sh
index 1faa70e308166bae9d50d9150618bdeaab34daf7..cd75f4f82e0807656756b29011f9c365ee18567a 100644 (file)
--- a/bin/tests/system/serve-stale/setup.sh
+++ b/bin/tests/system/serve-stale/setup.sh
@@ -1 +1,7 @@
+# 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/.
+
 cp -f ns1/named1.conf ns1/named.conf

diff --git a/bin/tests/system/serve-stale/tests.sh b/bin/tests/system/serve-stale/tests.sh
index e27c3a067fd615552d0c69dc36b509edbf8f7ff0..c4dfd53d3b984942e6682dfc7a97653b6a0b18a4 100755 (executable)
--- a/bin/tests/system/serve-stale/tests.sh
+++ b/bin/tests/system/serve-stale/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009-2016  Internet Systems Consortium, Inc. ("ISC")
+# 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

diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h
index 52e2a848e4f6d017f4d2d55ee6481817cba346ef..ea1b25eafe6fb422729d5941e8b87cb731fd7c73 100644 (file)
--- a/lib/dns/include/dns/cache.h
+++ b/lib/dns/include/dns/cache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2001, 2004-2007, 2009, 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2001, 2004-2007, 2009, 2011-2013, 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/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index 0473d51430a8635cb7a34ba7da4bacfa781d0842..957a7183a9e9db5180052709144170a4b057052d 100644 (file)
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2001, 2003-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2001, 2003-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/rbtdb.c b/lib/dns/rbtdb.c
index 37fe2d9cef022d38f04635e97575669ea39a5689..a9b74a49f4c37d6612bffa5e40cabf3a408ce607 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -2012,7 +2012,7 @@ clean_now_or_later(dns_rbtnode_t *node, dns_rbtdb_t *rbtdb,
                free_rdataset(rbtdb, mctx, header);
        } else {
                header->attributes |= RDATASET_ATTR_STALE |
-                                     RDATASET_ATTR_ANCIENT;
+                                     RDATASET_ATTR_ANCIENT;
                node->dirty = 1;
                *header_prevp = header;
        }

diff --git a/lib/dns/tests/db_test.c b/lib/dns/tests/db_test.c
index d1bbba9d896550fd6c2094ea3a088f602a6d33b8..03ffc308233b1a5c1f8b8abda153bcb23ad1d86c 100644 (file)
--- a/lib/dns/tests/db_test.c
+++ b/lib/dns/tests/db_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 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