update copyright notice / whitespace

diff --git a/bin/named/main.c b/bin/named/main.c
index 1faa2afd6612dc977722934fb1b2d3791a495587..539366d8b6605d0585668815e3aaa170d233cb9a 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -300,7 +300,7 @@ lwresd_usage(void) {
                "usage: lwresd [-4|-6] [-c conffile | -C resolvconffile] "
                "[-d debuglevel] [-f|-g]\n"
                "              [-i pidfile] [-n number_of_cpus] "
-               "[-p port] [-P listen-port]\n"
+               "[-p port] [-P listen-port]\n"
                "              [-s] [-S sockets] [-t chrootdir] [-u username] "
                "[-U listeners]\n"
                "              [-m {usage|trace|record|size|mctx}]\n"

diff --git a/bin/tests/system/checkconf/good-acl.conf b/bin/tests/system/checkconf/good-acl.conf
index 84ff712c367c4136ae1112fa3613135eab8d2988..043375e8ecea194b2314ce8eefd927aa85cd8e13 100644 (file)
--- a/bin/tests/system/checkconf/good-acl.conf
+++ b/bin/tests/system/checkconf/good-acl.conf
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2016  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.
+ */
+
 acl a {
        { "none"; };
        { !19.0.0.0/0; };

diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index c1c34ceae273add0849ba3fa1a017cd38ddc076b..38fef0f57755f1d14f82b8667020839826cb9378 100644 (file)
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any