From 3fda67b59698ad900dd1448b699a53f82ce12e5a Mon Sep 17 00:00:00 2001
From: Tinderbox User <tbox@isc.org>
Date: Mon, 22 Jan 2018 23:46:02 +0000
Subject: [PATCH] update copyright notice / whitespace

---
 bin/named/named.conf.docbook                          | 2 +-
 bin/nsupdate/nsupdate.c                               | 2 +-
 bin/tests/cfg_test.c                                  | 2 +-
 bin/tests/system/checkzone/zones/bad-generate-tkey.db | 2 +-
 bin/tests/system/checkzone/zones/bad-tkey.db          | 2 +-
 bin/tests/system/nsupdate/tests.sh                    | 2 +-
 doc/arm/Bv9ARM-book.xml                               | 3 ++-
 doc/arm/acl.grammar.xml                               | 2 +-
 doc/arm/controls.grammar.xml                          | 2 +-
 doc/arm/delegation-only.zoneopt.xml                   | 2 +-
 doc/arm/forward.zoneopt.xml                           | 2 +-
 doc/arm/hint.zoneopt.xml                              | 2 +-
 doc/arm/in-view.zoneopt.xml                           | 2 +-
 doc/arm/key.grammar.xml                               | 2 +-
 doc/arm/logging.grammar.xml                           | 2 +-
 doc/arm/managed-keys.grammar.xml                      | 2 +-
 doc/arm/master.zoneopt.xml                            | 2 +-
 doc/arm/masters.grammar.xml                           | 2 +-
 doc/arm/options.grammar.xml                           | 2 +-
 doc/arm/redirect.zoneopt.xml                          | 2 +-
 doc/arm/server.grammar.xml                            | 2 +-
 doc/arm/slave.zoneopt.xml                             | 2 +-
 doc/arm/static-stub.zoneopt.xml                       | 2 +-
 doc/arm/statistics-channels.grammar.xml               | 2 +-
 doc/arm/stub.zoneopt.xml                              | 2 +-
 doc/arm/trusted-keys.grammar.xml                      | 2 +-
 doc/misc/Makefile.in                                  | 2 +-
 doc/misc/docbook-grammars.pl                          | 2 +-
 doc/misc/docbook-options.pl                           | 2 +-
 doc/misc/docbook-zoneopt.pl                           | 2 +-
 lib/bind9/check.c                                     | 2 +-
 lib/dns/master.c                                      | 2 +-
 lib/isccfg/include/isccfg/cfg.h                       | 6 +++---
 lib/isccfg/include/isccfg/grammar.h                   | 2 +-
 lib/isccfg/include/isccfg/namedconf.h                 | 2 +-
 lib/isccfg/namedconf.c                                | 4 ++--
 lib/isccfg/parser.c                                   | 2 +-
 lib/isccfg/tests/parser_test.c                        | 2 +-
 lib/ns/update.c                                       | 2 +-
 util/merge_copyrights                                 | 2 +-
 40 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index adc1e7e9df..f3fce00629 100644
--- 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 61acb11281..4b6be545e3 100644
--- 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 d2401823e7..07e466aa93 100644
--- 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 0a79644082..c50b7d2fbb 100644
--- 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 c2e8c07fbf..ae5d068f50 100644
--- 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 31e54ac9ba..48f58590ab 100755
--- 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 a3ab5fe0f2..6fbab7b0c7 100644
--- 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 3758e1de5b..cfe0d080d7 100644
--- 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 51864c963f..035b1460c6 100644
--- 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 b367fb0313..6845b2f04f 100644
--- 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 4d8e9c1246..15b8aeb6c1 100644
--- 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 d2716aa4a0..df02f13901 100644
--- 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 729a66219c..9b93a78073 100644
--- 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 2fceb9cd69..e0946ab263 100644
--- 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 f9b3130125..076e5dfa84 100644
--- 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 3377a80cb4..875870ed78 100644
--- 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 8801e33dc1..06d86f918c 100644
--- 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 f76d9026ac..edbc47a9e6 100644
--- 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 d6898e0c1c..85ed2f1636 100644
--- 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 c176558126..4dc8fcb9fd 100644
--- 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 b78be9e9fa..27239bb159 100644
--- 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 b305787931..80d9f5d083 100644
--- 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 6571a8075f..6f8346ffe7 100644
--- 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 a50f32152c..8ff58b1f59 100644
--- 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 ccd038ffdb..1f803782b4 100644
--- 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 2e7da28a7b..1315b4d93f 100644
--- 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 5ee27a7e31..2f58c68fff 100644
--- 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 95620b2eff..91bf48d7d1 100644
--- 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 75b775f78b..4ec7101c95 100644
--- 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 900dddf53f..cc18bcad1e 100644
--- 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 ad599fdb53..8b30b7fd8f 100644
--- 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 855547e25a..58435824df 100644
--- 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 94dec54675..0bc9c14046 100644
--- 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 1257f2ea61..83732e9416 100644
--- 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 b5c3150c9c..c061103e26 100644
--- 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 8ccbd0e4f1..3e22866bd9 100644
--- 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 eb84363915..0df5ad5841 100644
--- 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 8f42c4aa0d..d72c629fc5 100644
--- 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 263e89d18b..0ba4cdff33 100644
--- 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 133151ae87..ba23bc592a 100644
--- 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
-- 
GitLab