update copyright notice / whitespace

bin/named/named.conf.docbook

 <!--
- - 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

bin/nsupdate/nsupdate.c

 /*
- * 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

bin/tests/cfg_test.c

 /*
- * 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

bin/tests/system/checkzone/zones/bad-generate-tkey.db

-; 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

bin/tests/system/checkzone/zones/bad-tkey.db

-; 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

bin/tests/system/nsupdate/tests.sh

 #!/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

doc/arm/Bv9ARM-book.xml

 <!--
- - 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 -->

doc/arm/acl.grammar.xml

 <!--
- - 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

doc/arm/controls.grammar.xml

 <!--
- - 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

doc/arm/delegation-only.zoneopt.xml

 <!--
- - 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

doc/arm/forward.zoneopt.xml

 <!--
- - 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

doc/arm/hint.zoneopt.xml

 <!--
- - 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

doc/arm/in-view.zoneopt.xml

 <!--
- - 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

doc/arm/key.grammar.xml

 <!--
- - 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

doc/arm/logging.grammar.xml

 <!--
- - 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

doc/arm/managed-keys.grammar.xml

 <!--
- - 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

doc/arm/master.zoneopt.xml

 <!--
- - 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

doc/arm/masters.grammar.xml

 <!--
- - 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

doc/arm/options.grammar.xml

 <!--
- - 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

doc/arm/redirect.zoneopt.xml

 <!--
- - 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

doc/arm/server.grammar.xml

 <!--
- - 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

doc/arm/slave.zoneopt.xml

 <!--
- - 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

doc/arm/static-stub.zoneopt.xml

 <!--
- - 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

doc/arm/statistics-channels.grammar.xml

 <!--
- - 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

doc/arm/stub.zoneopt.xml

 <!--
- - 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

doc/arm/trusted-keys.grammar.xml

 <!--
- - 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

doc/misc/Makefile.in

-# 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

doc/misc/docbook-grammars.pl

 #!/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

doc/misc/docbook-options.pl

 #!/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

doc/misc/docbook-zoneopt.pl

 #!/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

lib/bind9/check.c

 /*
- * 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

lib/dns/master.c

 /*
- * 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

lib/isccfg/include/isccfg/cfg.h

 /*
- * 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
 

lib/isccfg/include/isccfg/grammar.h

 /*
- * 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

lib/isccfg/include/isccfg/namedconf.h

 /*
- * 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

lib/isccfg/namedconf.c

 /*
- * 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");

lib/isccfg/parser.c

 /*
- * 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

lib/isccfg/tests/parser_test.c

 /*
- * 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

lib/ns/update.c

 /*
- * 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

util/merge_copyrights

 #!/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