update copyright notice / whitespace

diff --git a/bin/tests/system/checkconf/good-class.conf b/bin/tests/system/checkconf/good-class.conf
index ff2693eed5ee725d1f908cccec56d2d2481b8135..df25111c90acc8c56f322e24e120e1d18bc4ca58 100644 (file)
--- a/bin/tests/system/checkconf/good-class.conf
+++ b/bin/tests/system/checkconf/good-class.conf
@@ -1 +1,17 @@
+/*
+ * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 view "example" class00 { };

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index caf80d6a159f175e6add6195166102ca77f838c9..bc7aabe2e0e76e393ef5b54c9fe8898f8dcc3094 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -2922,7 +2922,7 @@ bind9_check_namedconf(const cfg_obj_t *config, isc_log_t *logctx,
                                const char *file;
                                unsigned int line;
                                RUNTIME_CHECK(isc_symtab_lookup(symtab, key,
-                                        symtype, &symvalue) == ISC_R_SUCCESS);
+                                        symtype, &symvalue) == ISC_R_SUCCESS);
                                file = cfg_obj_file(symvalue.as_cpointer);
                                line = cfg_obj_line(symvalue.as_cpointer);
                                cfg_obj_log(view, logctx, ISC_LOG_ERROR,

diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index 7c7bdce35ba94e7cb282b074d359de53fa62d732..92e835c05defff0d4cbd82ae05e4b76ae2d31cda 100644 (file)
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/rdata/generic/openpgpkey_61.c b/lib/dns/rdata/generic/openpgpkey_61.c
index d542aa9ea6b533a4bbfd03057b85c41c4a79a95b..4ff9f710b50edc2aa5aae16167d9a798c4ac3ed0 100644 (file)
--- a/lib/dns/rdata/generic/openpgpkey_61.c
+++ b/lib/dns/rdata/generic/openpgpkey_61.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above