update copyright notice

diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index ddf3ee499621b90ebd7a1db528771133193e0fa7..87ba9b192b0be891d20f29e03973ed5ec6e609ca 100644 (file)
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
               [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2009  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
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named.conf.docbook,v 1.40 2009/10/08 23:13:05 marka Exp $ -->
+<!-- $Id: named.conf.docbook,v 1.41 2009/10/08 23:48:09 tbox Exp $ -->
 <refentry>
   <refentryinfo>
     <date>Aug 13, 2004</date>
@@ -41,6 +41,7 @@
       <year>2006</year>
       <year>2007</year>
       <year>2008</year>
+      <year>2009</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>

diff --git a/bin/named/update.c b/bin/named/update.c
index b6b288e4f95716c8179c6afcec32a1be780bf303..406043d1c62d39c6a3dddb2f4cf977f92e93639c 100644 (file)
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.160 2009/10/08 23:13:05 marka Exp $ */
+/* $Id: update.c,v 1.161 2009/10/08 23:48:09 tbox Exp $ */
 
 #include <config.h>
 
@@ -3474,7 +3474,7 @@ isdnssec(dns_db_t *db, dns_dbversion_t *ver, dns_rdatatype_t privatetype) {
 
        if (dns_db_issecure(db))
                return (ISC_TRUE);
-       
+
        result = dns_private_chains(db, ver, privatetype,
                                    &build_nsec, &build_nsec3);
        RUNTIME_CHECK(result == ISC_R_SUCCESS);

diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
index 49a9aeb1b8ed10eac9217e02bf325756b0bb7542..6b6f2b3dc23f29fcb4b079ca4e2a8d0ee3eb2133 100644 (file)
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.56 2009/10/08 23:13:07 marka Exp $
+# $Id: Makefile.in,v 1.57 2009/10/08 23:48:10 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/dns/include/dns/nsec3.h b/lib/dns/include/dns/nsec3.h
index 905f6c1dd7f19be6bf096c08dfb36e877e771ee9..85c56b80e62fcaefc73ab50f3da252bc4602fc94 100644 (file)
--- a/lib/dns/include/dns/nsec3.h
+++ b/lib/dns/include/dns/nsec3.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec3.h,v 1.9 2009/10/08 23:13:07 marka Exp $ */
+/* $Id: nsec3.h,v 1.10 2009/10/08 23:48:10 tbox Exp $ */
 
 #ifndef DNS_NSEC3_H
 #define DNS_NSEC3_H 1
@@ -220,7 +220,7 @@ dns_nsec3_maxiterations(dns_db_t *db, dns_dbversion_t *version,
 
 isc_boolean_t
 dns_nsec3param_fromprivate(dns_rdata_t *src, dns_rdata_t *target,
-                           unsigned char *buf, size_t buflen);
+                          unsigned char *buf, size_t buflen);
 /*%<
  * Convert a private rdata to a nsec3param rdata.
  *
@@ -231,8 +231,8 @@ dns_nsec3param_fromprivate(dns_rdata_t *src, dns_rdata_t *target,
 
 void
 dns_nsec3param_toprivate(dns_rdata_t *src, dns_rdata_t *target,
-                         dns_rdatatype_t privatetype,
-                         unsigned char *buf, size_t buflen);
+                        dns_rdatatype_t privatetype,
+                        unsigned char *buf, size_t buflen);
 /*%<
  * Convert a nsec3param rdata to a private rdata.
  *

diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index d06846b9e96b320759b9548a32feacf4e07389b2..328ad5ea54f91f42eec7332e6f0429d46b1d19a6 100644 (file)
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.h,v 1.75 2009/10/08 23:13:07 marka Exp $ */
+/* $Id: rdata.h,v 1.76 2009/10/08 23:48:10 tbox Exp $ */
 
 #ifndef DNS_RDATA_H
 #define DNS_RDATA_H 1
@@ -128,13 +128,13 @@ struct dns_rdata {
 #define DNS_RDATA_CHECKINITIALIZED
 #ifdef DNS_RDATA_CHECKINITIALIZED
 #define DNS_RDATA_INITIALIZED(rdata) \
-        ((rdata)->data == NULL && (rdata)->length == 0 && \
-         (rdata)->rdclass == 0 && (rdata)->type == 0 && (rdata)->flags == 0 && \
-         !ISC_LINK_LINKED((rdata), link))
-#else   
+       ((rdata)->data == NULL && (rdata)->length == 0 && \
+        (rdata)->rdclass == 0 && (rdata)->type == 0 && (rdata)->flags == 0 && \
+        !ISC_LINK_LINKED((rdata), link))
+#else
 #ifdef ISC_LIST_CHECKINIT
 #define DNS_RDATA_INITIALIZED(rdata) \
-        (!ISC_LINK_LINKED((rdata), link))
+       (!ISC_LINK_LINKED((rdata), link))
 #else
 #define DNS_RDATA_INITIALIZED(rdata) ISC_TRUE
 #endif
@@ -144,7 +144,7 @@ struct dns_rdata {
 #define DNS_RDATA_OFFLINE      0x0002          /*%< RRSIG has a offline key. */
 
 #define DNS_RDATA_VALIDFLAGS(rdata) \
-        (((rdata)->flags & ~(DNS_RDATA_UPDATE|DNS_RDATA_OFFLINE)) == 0)
+       (((rdata)->flags & ~(DNS_RDATA_UPDATE|DNS_RDATA_OFFLINE)) == 0)
 
 /*
  * Flags affecting rdata formatting style.  Flags 0xFFFF0000

diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c
index b087cf0857959b440c55f2dce7ca80367289deb0..81de97f4f4fbf043a74fda47e9cb331c6bd4f21e 100644 (file)
--- a/lib/dns/nsec3.c
+++ b/lib/dns/nsec3.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec3.c,v 1.9 2009/10/08 23:13:06 marka Exp $ */
+/* $Id: nsec3.c,v 1.10 2009/10/08 23:48:10 tbox Exp $ */
 
 #include <config.h>
 
@@ -482,7 +482,7 @@ better_param(dns_rdataset_t *nsec3paramset, dns_rdata_t *param) {
                                continue;
                } else
                        dns_rdataset_current(&rdataset, &rdata);
-               
+
                if (rdata.length != param->length)
                        continue;
                if (rdata.data[0] != param->data[0] ||
@@ -948,8 +948,8 @@ isc_boolean_t
 dns_nsec3param_fromprivate(dns_rdata_t *src, dns_rdata_t *target,
                           unsigned char *buf, size_t buflen)
 {
-        dns_decompress_t dctx;
-        isc_result_t result;
+       dns_decompress_t dctx;
+       isc_result_t result;
        isc_buffer_t buf1;
        isc_buffer_t buf2;
 
@@ -962,20 +962,20 @@ dns_nsec3param_fromprivate(dns_rdata_t *src, dns_rdata_t *target,
 
        isc_buffer_init(&buf1, src->data + 1, src->length - 1);
        isc_buffer_add(&buf1, src->length - 1);
-        isc_buffer_setactive(&buf1, src->length - 1);
+       isc_buffer_setactive(&buf1, src->length - 1);
        isc_buffer_init(&buf2, buf, buflen);
-        dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_NONE);
-        result = dns_rdata_fromwire(target, src->rdclass,
+       dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_NONE);
+       result = dns_rdata_fromwire(target, src->rdclass,
                                    dns_rdatatype_nsec3param,
                                    &buf1, &dctx, 0, &buf2);
-        dns_decompress_invalidate(&dctx);
+       dns_decompress_invalidate(&dctx);
 
-        return (ISC_TF(result == ISC_R_SUCCESS));
+       return (ISC_TF(result == ISC_R_SUCCESS));
 }
 
 void
 dns_nsec3param_toprivate(dns_rdata_t *src, dns_rdata_t *target,
-                        dns_rdatatype_t privatetype, 
+                        dns_rdatatype_t privatetype,
                         unsigned char *buf, size_t buflen)
 {
        REQUIRE(buflen >= src->length + 1);

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index c7a431b680378d616a032d566a37e5523151f49c..1dc5a5fb2cf84789bcba5ca48c42cbd521323b19 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.510 2009/10/08 23:13:07 marka Exp $ */
+/* $Id: zone.c,v 1.511 2009/10/08 23:48:10 tbox Exp $ */
 
 /*! \file */
 
@@ -2309,7 +2309,7 @@ zone_addnsec3chain(dns_zone_t *zone, dns_rdata_nsec3param_t *nsec3param) {
        }
        if (nsec3param->salt_length == 0)
                strlcpy(saltbuf, "-", sizeof(saltbuf));
-       else 
+       else
                for (i = 0; i < nsec3param->salt_length; i++)
                        sprintf(&saltbuf[i*2], "%02X", nsec3chain->salt[i]);
        dns_zone_log(zone, ISC_LOG_INFO,
@@ -5014,7 +5014,7 @@ updatesignwithkey(dns_zone_t *zone, dns_signing_t *signing,
        if (result != ISC_R_SUCCESS)
                goto failure;
 
-       result = dns_db_findrdataset(signing->db, node, version, 
+       result = dns_db_findrdataset(signing->db, node, version,
                                     zone->privatetype, dns_rdatatype_none,
                                     0, &rdataset, NULL);
        if (result == ISC_R_NOTFOUND) {
@@ -5073,7 +5073,7 @@ updatesignwithkey(dns_zone_t *zone, dns_signing_t *signing,
  * If 'active' is set then we are not done with the chain yet so only
  * delete the nsec3param record which indicates a full chain exists
  * (flags == 0).
- */ 
+ */
 static isc_result_t
 fixup_nsec3param(dns_db_t *db, dns_dbversion_t *ver, dns_nsec3chain_t *chain,
                 isc_boolean_t active, dns_rdatatype_t privatetype,
@@ -5216,7 +5216,7 @@ delete_nsec(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node,
                                     0, 0, &rdataset, NULL);
        if (result == ISC_R_NOTFOUND)
                return (ISC_R_SUCCESS);
-       if (result != ISC_R_SUCCESS) 
+       if (result != ISC_R_SUCCESS)
                return (result);
        for (result = dns_rdataset_first(&rdataset);
             result == ISC_R_SUCCESS;
@@ -5387,7 +5387,7 @@ update_sigs(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *version,
                        dns_difftuple_t *next = ISC_LIST_NEXT(tuple, link);
                        while (next != NULL &&
                               (tuple->rdata.type != next->rdata.type ||
-                               !dns_name_equal(&tuple->name, &next->name)))
+                               !dns_name_equal(&tuple->name, &next->name)))
                                next = ISC_LIST_NEXT(next, link);
                        ISC_LIST_UNLINK(diff->tuples, tuple, link);
                        dns_diff_appendminimal(sig_diff, &tuple);
@@ -5733,8 +5733,8 @@ zone_nsec3chain(dns_zone_t *zone) {
                if (first && !updatensec &&
                    (nsec3chain->nsec3param.flags & DNS_NSEC3FLAG_NONSEC) == 0) {
                        result = need_nsec_chain(db, version,
-                                                &nsec3chain->nsec3param,
-                                                &buildnsecchain);
+                                                &nsec3chain->nsec3param,
+                                                &buildnsecchain);
                        if (result != ISC_R_SUCCESS) {
                                dns_zone_log(zone, ISC_LOG_ERROR,
                                             "zone_nsec3chain:"
@@ -5742,7 +5742,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                                             dns_result_totext(result));
                                goto failure;
                        }
-               }       
+               }
 
                if (first)
                        dns_zone_log(zone, ISC_LOG_DEBUG(3), "zone_nsec3chain:"
@@ -5758,8 +5758,8 @@ zone_nsec3chain(dns_zone_t *zone) {
                        if (first) {
                                result = fixup_nsec3param(db, version,
                                                          nsec3chain,
-                                                         ISC_TRUE, privatetype,
-                                                         &param_diff);
+                                                         ISC_TRUE, privatetype,
+                                                         &param_diff);
                                if (result != ISC_R_SUCCESS) {
                                        dns_zone_log(zone, ISC_LOG_ERROR,
                                                     "zone_nsec3chain:"
@@ -5873,7 +5873,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                                result = fixup_nsec3param(db, version,
                                                          nsec3chain, ISC_FALSE,
                                                          privatetype,
-                                                         &param_diff);
+                                                         &param_diff);
                                if (result != ISC_R_SUCCESS) {
                                        dns_zone_log(zone, ISC_LOG_ERROR,
                                                     "zone_nsec3chain:"