update copyright notice / whitespace

diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index adc1e7e9df52190fb18bc4179de3b5a3e717d3c4..f3fce006294be1b84fb1869fc3f436535f763dcf 100644 (file)
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2018  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/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 61acb112813287f2a890073b177e9e5eda53c818..4b6be545e355a13367de8de30c726653e05201e1 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2018  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/cfg_test.c b/bin/tests/cfg_test.c
index d2401823e79ce51cf17eee402fb276fb24cbce8e..07e466aa932eb6b1db306d95a39e0363b8d26c05 100644 (file)
--- a/bin/tests/cfg_test.c
+++ b/bin/tests/cfg_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2004, 2005, 2007, 2009-2011, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2001, 2002, 2004, 2005, 2007, 2009-2011, 2015, 2016, 2018  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/checkzone/zones/bad-generate-tkey.db b/bin/tests/system/checkzone/zones/bad-generate-tkey.db
index 0a796440829d56a9535ef8279673c0241425731f..c50b7d2fbb021e087d201736d8404d67ff215d1c 100644 (file)
--- a/bin/tests/system/checkzone/zones/bad-generate-tkey.db
+++ b/bin/tests/system/checkzone/zones/bad-generate-tkey.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2018  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/checkzone/zones/bad-tkey.db b/bin/tests/system/checkzone/zones/bad-tkey.db
index c2e8c07fbf24d599d4ae4bb82ed8c3ae41577d6a..ae5d068f50c4c37c5a2109dbc48aa737dcb5761c 100644 (file)
--- a/bin/tests/system/checkzone/zones/bad-tkey.db
+++ b/bin/tests/system/checkzone/zones/bad-tkey.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2018  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/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
index 31e54ac9baff4a3a8f7d08081eab9c134b1c3a55..48f58590aba194ed5b263894b625c2beda2a93b8 100755 (executable)
--- a/bin/tests/system/nsupdate/tests.sh
+++ b/bin/tests/system/nsupdate/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2009-2018  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/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index a3ab5fe0f29adf9ad602ee96255b467d40c56f30..6fbab7b0c728f504b8367092528799b0aa5689c6 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2000-2017  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2000-2018  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
@@ -30,6 +30,7 @@
       <year>2015</year>
       <year>2016</year>
       <year>2017</year>
+      <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <!-- insert copyright end -->

diff --git a/doc/arm/acl.grammar.xml b/doc/arm/acl.grammar.xml
index 3758e1de5b265bf82b6051b0408e4145d1984fe1..cfe0d080d776a5649ca83099f13a0fac93592c87 100644 (file)
--- a/doc/arm/acl.grammar.xml
+++ b/doc/arm/acl.grammar.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/controls.grammar.xml b/doc/arm/controls.grammar.xml
index 51864c963fb2812a6c18150cb2fdb8353ff63ed1..035b1460c679e6decaa4e6c760cdf0f8780a221b 100644 (file)
--- a/doc/arm/controls.grammar.xml
+++ b/doc/arm/controls.grammar.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/delegation-only.zoneopt.xml b/doc/arm/delegation-only.zoneopt.xml
index b367fb0313cc4524c203cfb29477c996b9db41cf..6845b2f04f7867e0c41b43b61709d81d612439b1 100644 (file)
--- a/doc/arm/delegation-only.zoneopt.xml
+++ b/doc/arm/delegation-only.zoneopt.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/forward.zoneopt.xml b/doc/arm/forward.zoneopt.xml
index 4d8e9c124632f687977edba1774afb8928e1a206..15b8aeb6c1d55300acfeb6bd0398847d1ace4474 100644 (file)
--- a/doc/arm/forward.zoneopt.xml
+++ b/doc/arm/forward.zoneopt.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/hint.zoneopt.xml b/doc/arm/hint.zoneopt.xml
index d2716aa4a0691b813aa38e7201711241d1805c20..df02f1390169994dba9857c48d380697c56f1d12 100644 (file)
--- a/doc/arm/hint.zoneopt.xml
+++ b/doc/arm/hint.zoneopt.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/in-view.zoneopt.xml b/doc/arm/in-view.zoneopt.xml
index 729a66219c8297e807d713105fb424104d1c2156..9b93a78073fa7c0bf1b238c0df80f2c64b25da5f 100644 (file)
--- a/doc/arm/in-view.zoneopt.xml
+++ b/doc/arm/in-view.zoneopt.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/key.grammar.xml b/doc/arm/key.grammar.xml
index 2fceb9cd691ea994ec4fc2eceea00699479c45c1..e0946ab26385f56d3b73d1fb41050555d7480694 100644 (file)
--- a/doc/arm/key.grammar.xml
+++ b/doc/arm/key.grammar.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/logging.grammar.xml b/doc/arm/logging.grammar.xml
index f9b3130125b69e38f8344870fc5403dcbf2529df..076e5dfa84fca6370e5a90e64e57a80e715fdded 100644 (file)
--- a/doc/arm/logging.grammar.xml
+++ b/doc/arm/logging.grammar.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/managed-keys.grammar.xml b/doc/arm/managed-keys.grammar.xml
index 3377a80cb43157b9ac2bd627a78e902d1671ebb2..875870ed78729e2bc3373ddaf25a5b61b3ec77c4 100644 (file)
--- a/doc/arm/managed-keys.grammar.xml
+++ b/doc/arm/managed-keys.grammar.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/master.zoneopt.xml b/doc/arm/master.zoneopt.xml
index 8801e33dc16746386d6a6e4e56d9102fa1c87771..06d86f918c126f5c04f8fdd1c2c98f1b64542d03 100644 (file)
--- a/doc/arm/master.zoneopt.xml
+++ b/doc/arm/master.zoneopt.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/masters.grammar.xml b/doc/arm/masters.grammar.xml
index f76d9026ac018646e6abda49744c329e32d41d7a..edbc47a9e6218ab2d4e638a650818f27dbc2651d 100644 (file)
--- a/doc/arm/masters.grammar.xml
+++ b/doc/arm/masters.grammar.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/options.grammar.xml b/doc/arm/options.grammar.xml
index d6898e0c1cf88922d4b8856068edc85fb3508f68..85ed2f1636798455557209f7f72dde1ba9cea1af 100644 (file)
--- a/doc/arm/options.grammar.xml
+++ b/doc/arm/options.grammar.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/redirect.zoneopt.xml b/doc/arm/redirect.zoneopt.xml
index c176558126606f41c19ab8906cd206d2dff4bf30..4dc8fcb9fdf14ca97f26dad2d9f6ab8b279eb1a8 100644 (file)
--- a/doc/arm/redirect.zoneopt.xml
+++ b/doc/arm/redirect.zoneopt.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/server.grammar.xml b/doc/arm/server.grammar.xml
index b78be9e9fab4e2b387237951cee6f9548d8bde7d..27239bb159fa003b5e7f06cdba43e14472643f02 100644 (file)
--- a/doc/arm/server.grammar.xml
+++ b/doc/arm/server.grammar.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/slave.zoneopt.xml b/doc/arm/slave.zoneopt.xml
index b305787931ec40a8cd253c969302954de789284c..80d9f5d083ca6cf52def4cb1c011a53e85ae8de9 100644 (file)
--- a/doc/arm/slave.zoneopt.xml
+++ b/doc/arm/slave.zoneopt.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/static-stub.zoneopt.xml b/doc/arm/static-stub.zoneopt.xml
index 6571a8075fa28cd1ad8f03179b95345a4b09fb5b..6f8346ffe7fcc5e1f68a916bf8bbe2d6ea9ba397 100644 (file)
--- a/doc/arm/static-stub.zoneopt.xml
+++ b/doc/arm/static-stub.zoneopt.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/statistics-channels.grammar.xml b/doc/arm/statistics-channels.grammar.xml
index a50f32152c3ebbd223e8cbe571c1fd8817184ca5..8ff58b1f5990746dbc2707c0a0c638f32fc7d8d3 100644 (file)
--- a/doc/arm/statistics-channels.grammar.xml
+++ b/doc/arm/statistics-channels.grammar.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/stub.zoneopt.xml b/doc/arm/stub.zoneopt.xml
index ccd038ffdb74fcc9a36a35c2448d44a1aafa6404..1f803782b41fe0d081002fb2957a0317b554ef58 100644 (file)
--- a/doc/arm/stub.zoneopt.xml
+++ b/doc/arm/stub.zoneopt.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/arm/trusted-keys.grammar.xml b/doc/arm/trusted-keys.grammar.xml
index 2e7da28a7bfe734947cb88b419c2866bbb8feaa9..1315b4d93fee0b29bcbf1614a2fe07318be0359c 100644 (file)
--- a/doc/arm/trusted-keys.grammar.xml
+++ b/doc/arm/trusted-keys.grammar.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018  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/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 5ee27a7e319cabfe6ebd098daa5817eba8ac52c5..2f58c68fff35c321c97b6d797e797b5a735fc24e 100644 (file)
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2004, 2007, 2009, 2012, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2009, 2012, 2016-2018  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/doc/misc/docbook-grammars.pl b/doc/misc/docbook-grammars.pl
index 95620b2eff19190d7d65f95b60943aa3e710cd8f..91bf48d7d1809596947f34ceb2db2ae9e2e7a471 100644 (file)
--- a/doc/misc/docbook-grammars.pl
+++ b/doc/misc/docbook-grammars.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  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/doc/misc/docbook-options.pl b/doc/misc/docbook-options.pl
index 75b775f78bf1cdc7f3662769a0d341338d46534c..4ec7101c956afc637ad7aaa7b8a8c006c1377496 100644 (file)
--- a/doc/misc/docbook-options.pl
+++ b/doc/misc/docbook-options.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  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/doc/misc/docbook-zoneopt.pl b/doc/misc/docbook-zoneopt.pl
index 900dddf53f3033006cea420f404359a9b4b4a309..cc18bcad1e79b31a8aba3c7badc93681c92b7a1c 100644 (file)
--- a/doc/misc/docbook-zoneopt.pl
+++ b/doc/misc/docbook-zoneopt.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  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/bind9/check.c b/lib/bind9/check.c
index ad599fdb535d750c53be2fc918e739b34b887874..8b30b7fd8fc759402a65d5bfa5a115944fc2893d 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2001-2018  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/master.c b/lib/dns/master.c
index 855547e25a1b77118657e1587cb2bdb98d3ee06a..58435824dfb23979f5228b44b6fe7bf6d5c9128c 100644 (file)
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2009, 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2009, 2011-2018  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/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h
index 94dec54675ee81290f970af14352e5939cbe0abe..0bc9c14046b831ba6930162b7650e9d1435b72cb 100644 (file)
--- a/lib/isccfg/include/isccfg/cfg.h
+++ b/lib/isccfg/include/isccfg/cfg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2002, 2004-2007, 2010, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2002, 2004-2007, 2010, 2013-2016, 2018  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
@@ -538,10 +538,10 @@ cfg_obj_line(const cfg_obj_t *obj);
 
 const char *
 cfg_map_firstclause(const cfg_type_t *map, const void **clauses,
-                    unsigned int *idx);
+                   unsigned int *idx);
 const char *
 cfg_map_nextclause(const cfg_type_t *map, const void **clauses,
-                   unsigned int *idx);
+                  unsigned int *idx);
 
 ISC_LANG_ENDDECLS
 

diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 1257f2ea611283939793289065cc33805d4a2608..83732e94162bfa06aa1de0af2d5998d43344ee52 100644 (file)
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2011, 2013-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2002-2011, 2013-2018  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/isccfg/include/isccfg/namedconf.h b/lib/isccfg/include/isccfg/namedconf.h
index b5c3150c9c5273dd24e7b69bde3b2e15d6bf8be2..c061103e26e0bac4e88eab24418adce37febca72 100644 (file)
--- a/lib/isccfg/include/isccfg/namedconf.h
+++ b/lib/isccfg/include/isccfg/namedconf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2004-2007, 2009, 2010, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2002, 2004-2007, 2009, 2010, 2014, 2016, 2018  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/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 8ccbd0e4f19424f78910921d8e0f8d52f1b00066..3e22866bd9ca5b900eaf1e554136699826e1d5f0 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2002-2018  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
@@ -4093,7 +4093,7 @@ cfg_print_zonegrammar(const unsigned int zonetype,
 
        memmove(clauses, zone_clauses, sizeof(zone_clauses));
        memmove(clauses + sizeof(zone_clauses)/sizeof(zone_clauses[0]) - 1,
-               zone_only_clauses, sizeof(zone_only_clauses));
+               zone_only_clauses, sizeof(zone_only_clauses));
        qsort(clauses, NCLAUSES - 1, sizeof(clause[0]), cmp_clause);
 
        cfg_print_cstr(&pctx, "zone <string> [ <class> ] {\n");

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index eb843639151dabb9f5a65aa8e4cd2da3a6bc70ab..0df5ad5841864870d11dba50e2051308e6b54d98 100644 (file)
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2018  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/isccfg/tests/parser_test.c b/lib/isccfg/tests/parser_test.c
index 8f42c4aa0d9662cf1ab5a926c9612d453e9d5a3e..d72c629fc5c7c07cd22a41d71498fd4cf31d32ee 100644 (file)
--- a/lib/isccfg/tests/parser_test.c
+++ b/lib/isccfg/tests/parser_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2018  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/ns/update.c b/lib/ns/update.c
index 263e89d18be5e4c74fb8dd244de86d577fd7ac42..0ba4cdff330f467a18e66316a7e47d03555893f4 100644 (file)
--- a/lib/ns/update.c
+++ b/lib/ns/update.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  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/merge_copyrights b/util/merge_copyrights
index 133151ae8714996430cd38855e02583d1ca313db..ba23bc592afc23b6fc33e5c57a89c72b1aef72ac 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl -w
 #
-# Copyright (C) 1998-2001, 2003-2007, 2009-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 1998-2001, 2003-2007, 2009-2018  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