update copyright notice

diff --git a/CHANGES b/CHANGES
index d550c78352bca9227336fcb5530ccb827b6500e4..2b4f1996d0c528ac7420fe71aa1e63119de1bad1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -20,7 +20,7 @@
 
 3919.  [bug]           dig: continue to next line if a address lookup fails
                        in batch mode. [RT #36755]
-                       
+
 3918.  [doc]           Update check-spf documentation. [RT #36910]
 
 3917.  [bug]           dig, nslookup and host now continue on names that are

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 9a6f0f95941f103b38d97def800891c40350e86c..f06aeb483436ab7f7826dbe6bd45fa2de6bfb630 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1700,7 +1700,7 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
                if (strncmp(rv[0], "%", 1) == 0)
                        break;
                if (rv[0][0] == '@') {
-                       
+
                        if (is_batchfile && !config_only) {
                                addresscount = getaddresses(lookup, &rv[0][1],
                                                             &result);
@@ -1708,14 +1708,14 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
                                        fprintf(stderr, "couldn't get address "
                                                "for '%s': %s: skipping "
                                                "lookup\n", &rv[0][1],
-                                               isc_result_totext(result));
+                                               isc_result_totext(result));
                                        if (ISC_LINK_LINKED(lookup, link))
                                                ISC_LIST_DEQUEUE(lookup_list,
                                                                 lookup, link);
                                        destroy_lookup(lookup);
                                        return;
                                }
-                       } else 
+                       } else
                                addresscount = getaddresses(lookup, &rv[0][1],
                                                            NULL);
                } else if (rv[0][0] == '+') {

diff --git a/bin/tests/system/dnssec/ns1/root.db.in b/bin/tests/system/dnssec/ns1/root.db.in
index 6efbef1674224cf9a1da3e23f7683d4db0141380..7e4575917a059bb2a2c088334e0f255dc5775f1f 100644 (file)
--- a/bin/tests/system/dnssec/ns1/root.db.in
+++ b/bin/tests/system/dnssec/ns1/root.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007, 2010, 2013  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2010, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/dnssec/ns2/in-addr.arpa.db.in b/bin/tests/system/dnssec/ns2/in-addr.arpa.db.in
index d60b717ef1e89337dd816715cfedf12f119cd319..b62197c0899e7c558aadc47054bef6ef98d65c5b 100644 (file)
--- a/bin/tests/system/dnssec/ns2/in-addr.arpa.db.in
+++ b/bin/tests/system/dnssec/ns2/in-addr.arpa.db.in
@@ -1,3 +1,17 @@
+; Copyright (C) 2014  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.
+
 $TTL 3600
 @      SOA     ns2.example. . 1 3600 1200 86400 1200
 @      NS      ns2.example.

diff --git a/bin/tests/system/dnssec/ns2/named.conf b/bin/tests/system/dnssec/ns2/named.conf
index a6f9aafca425433a9872279599891cfbb70324ef..baeba5997d831ff8ad9212932e7e52d149aa4d77 100644 (file)
--- a/bin/tests/system/dnssec/ns2/named.conf
+++ b/bin/tests/system/dnssec/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2008, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2008, 2010, 2011, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -65,8 +65,8 @@ zone "insecure.secure.example" {
 };
 
 zone "rfc2335.example" {
-        type master;
-        file "rfc2335.example.db";
+       type master;
+       file "rfc2335.example.db";
 };
 
 zone "child.nsec3.example" {