update copyright notice

diff --git a/bin/named/update.c b/bin/named/update.c
index 9960dd8f34e1c1e4b40b67dff3f3449e9e6d3ed7..c2924013b7167457b7dcf1b76487c09ba3b563b5 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.109.18.28 2008/11/20 01:24:16 marka Exp $ */
+/* $Id: update.c,v 1.109.18.29 2008/11/20 23:46:03 tbox Exp $ */
 
 #include <config.h>
 
@@ -1792,7 +1792,7 @@ add_sigs(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
 
 static isc_result_t
 add_exposed_sigs(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
-                dns_dbversion_t *ver, dns_name_t *name, isc_boolean_t cut,
+                dns_dbversion_t *ver, dns_name_t *name, isc_boolean_t cut,
                 dns_diff_t *diff, dst_key_t **keys, unsigned int nkeys,
                 isc_stdtime_t inception, isc_stdtime_t expire,
                 isc_boolean_t check_ksk)
@@ -2115,7 +2115,7 @@ update_signatures(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
                                CHECK(add_placeholder_nsec(db, newver, &t->name,
                                                          diff));
                        CHECK(add_exposed_sigs(client, zone, db, newver, name,
-                                              cut, diff, zone_keys, nkeys,
+                                              cut, diff, zone_keys, nkeys,
                                               inception, expire, check_ksk));
                }
        }

diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c
index 9c0f392909c679b722402c98c4c0141418e93148..68ac558e65a6abc7679bacb7f205e3f7cb7961ab 100644 (file)
--- a/bin/named/xfrout.c
+++ b/bin/named/xfrout.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * 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.
  *
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrout.c,v 1.115.18.9 2008/11/20 00:54:45 marka Exp $ */
+/* $Id: xfrout.c,v 1.115.18.10 2008/11/20 23:46:03 tbox Exp $ */
 
 #include <config.h>
 
@@ -51,7 +51,7 @@
 #include <named/server.h>
 #include <named/xfrout.h>
 
-/*! \file 
+/*! \file
  * \brief
  * Outgoing AXFR and IXFR.
  */
@@ -86,7 +86,7 @@
                ns_client_log(client, DNS_LOGCATEGORY_XFER_OUT, \
                           NS_LOGMODULE_XFER_OUT, ISC_LOG_INFO, \
                           "bad zone transfer request: %s (%s)", \
-                          msg, isc_result_totext(code));       \
+                          msg, isc_result_totext(code));       \
                if (result != ISC_R_SUCCESS) goto failure;      \
        } while (0)
 
@@ -100,12 +100,12 @@
                ns_client_log(client, DNS_LOGCATEGORY_XFER_OUT, \
                           NS_LOGMODULE_XFER_OUT, ISC_LOG_INFO, \
                           "bad zone transfer request: '%s/%s': %s (%s)", \
-                          _buf1, _buf2, msg, isc_result_totext(code)); \
+                          _buf1, _buf2, msg, isc_result_totext(code)); \
                if (result != ISC_R_SUCCESS) goto failure;      \
        } while (0)
 
 #define CHECK(op) \
-       do { result = (op);                                     \
+       do { result = (op);                                     \
                if (result != ISC_R_SUCCESS) goto failure;      \
        } while (0)
 
@@ -121,12 +121,12 @@ typedef struct db_rr_iterator db_rr_iterator_t;
 struct db_rr_iterator {
        isc_result_t            result;
        dns_db_t                *db;
-       dns_dbiterator_t        *dbit;
+       dns_dbiterator_t        *dbit;
        dns_dbversion_t         *ver;
        isc_stdtime_t           now;
        dns_dbnode_t            *node;
        dns_fixedname_t         fixedname;
-       dns_rdatasetiter_t      *rdatasetit;
+       dns_rdatasetiter_t      *rdatasetit;
        dns_rdataset_t          rdataset;
        dns_rdata_t             rdata;
 };
@@ -331,7 +331,7 @@ log_rr(dns_name_t *name, dns_rdata_t *rdata, isc_uint32_t ttl) {
                INSIST(buf.used >= 1 &&
                       ((char *) buf.base)[buf.used - 1] == '\n');
                buf.used--;
-               
+
                isc_log_write(XFROUT_RR_LOGARGS, "%.*s",
                              (int)isc_buffer_usedlength(&buf),
                              (char *)isc_buffer_base(&buf));
@@ -974,7 +974,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
                /*
                 * Normal zone table does not have a match.  Try the DLZ database
                 */
-               if (client->view->dlzdatabase != NULL) {
+               if (client->view->dlzdatabase != NULL) {
                        result = dns_dlzallowzonexfr(client->view,
                                                     question_name, &client->peeraddr,
                                                     &db);
@@ -1011,7 +1011,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
 
                } else {
                        /*
-                        * not DLZ and not in normal zone table, we are
+                        * not DLZ and not in normal zone table, we are
                         * not authoritative
                         */
                        FAILQ(DNS_R_NOTAUTH, "non-authoritative zone",
@@ -1215,26 +1215,26 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
 
 #ifdef DLZ
        if (is_dlz)
-               CHECK(xfrout_ctx_create(mctx, client, request->id, question_name,
-                                       reqtype, question_class, db, ver, quota,
-                                       stream, dns_message_gettsigkey(request),
-                                       tsigbuf,
-                                       3600,
-                                       3600,
-                                       (format == dns_many_answers) ?
-                                       ISC_TRUE : ISC_FALSE,
-                                       &xfr));
-       else
+               CHECK(xfrout_ctx_create(mctx, client, request->id, question_name,
+                                       reqtype, question_class, db, ver, quota,
+                                       stream, dns_message_gettsigkey(request),
+                                       tsigbuf,
+                                       3600,
+                                       3600,
+                                       (format == dns_many_answers) ?
+                                       ISC_TRUE : ISC_FALSE,
+                                       &xfr));
+       else
 #endif
-               CHECK(xfrout_ctx_create(mctx, client, request->id, question_name,
-                                       reqtype, question_class, db, ver, quota,
-                                       stream, dns_message_gettsigkey(request),
-                                       tsigbuf,
-                                       dns_zone_getmaxxfrout(zone),
-                                       dns_zone_getidleout(zone),
-                                       (format == dns_many_answers) ?
-                                       ISC_TRUE : ISC_FALSE,
-                                       &xfr));
+               CHECK(xfrout_ctx_create(mctx, client, request->id, question_name,
+                                       reqtype, question_class, db, ver, quota,
+                                       stream, dns_message_gettsigkey(request),
+                                       tsigbuf,
+                                       dns_zone_getmaxxfrout(zone),
+                                       dns_zone_getidleout(zone),
+                                       (format == dns_many_answers) ?
+                                       ISC_TRUE : ISC_FALSE,
+                                       &xfr));
 
        xfr->mnemonic = mnemonic;
        stream = NULL;
@@ -1673,7 +1673,7 @@ sendstream(xfrout_ctx_t *xfr) {
         * iterators before returning from the event handler.
         */
        xfr->stream->methods->pause(xfr->stream);
-       
+
        if (result == ISC_R_SUCCESS)
                return;
 

diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index 7d425d5111846eb046c6beada82f7da0e92b7ea7..0487907137d7446885585568c45e97b324be0d08 100644 (file)
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dnssec.c,v 1.81.18.11 2008/11/20 02:02:44 marka Exp $
+ * $Id: dnssec.c,v 1.81.18.12 2008/11/20 23:46:03 tbox Exp $
  */
 
 /*! \file */
@@ -431,7 +431,7 @@ dns_dnssec_verify2(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
        dns_fixedname_init(&fnewname);
        labels = dns_name_countlabels(name) - 1;
        RUNTIME_CHECK(dns_name_downcase(name, dns_fixedname_name(&fnewname),
-                                       NULL) == ISC_R_SUCCESS);
+                                       NULL) == ISC_R_SUCCESS);
        if (labels - sig.labels > 0)
                dns_name_split(dns_fixedname_name(&fnewname), sig.labels + 1,
                               NULL, dns_fixedname_name(&fnewname));
@@ -511,9 +511,9 @@ cleanup_struct:
        dns_rdata_freestruct(&sig);
 
        if (ret == ISC_R_SUCCESS && labels - sig.labels > 0) {
-               if (wild != NULL) 
+               if (wild != NULL)
                        RUNTIME_CHECK(dns_name_concatenate(dns_wildcardname,
-                                                dns_fixedname_name(&fnewname),
+                                                dns_fixedname_name(&fnewname),
                                                 wild, NULL) == ISC_R_SUCCESS);
                ret = DNS_R_FROMWILDCARD;
        }
@@ -829,7 +829,7 @@ dns_dnssec_verifymessage(isc_buffer_t *source, dns_message_t *msg,
        RETERR(dst_context_create(key, mctx, &ctx));
 
        /*
-        * Digest the SIG(0) record, except for the signature.
+        * Digest the SIG(0) record, except for the signature.
         */
        dns_rdata_toregion(&rdata, &r);
        r.length -= sig.siglen;

diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index 5038204ae9c6969fbf334c36d8e1703c73a0f826..d8700e9816efbda2930fd723ab5852d144672c29 100644 (file)
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -1,9 +1,9 @@
 /*
- * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2006, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * 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.
  *
@@ -18,7 +18,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: dst_api.c,v 1.1.6.8 2008/11/20 02:02:44 marka Exp $
+ * $Id: dst_api.c,v 1.1.6.9 2008/11/20 23:46:03 tbox Exp $
  */
 
 /*! \file */
@@ -112,16 +112,16 @@ static isc_result_t       addsuffix(char *filename, unsigned int len,
 
 static void *
 default_memalloc(void *arg, size_t size) {
-        UNUSED(arg);
-        if (size == 0U)
-                size = 1;
-        return (malloc(size));
+       UNUSED(arg);
+       if (size == 0U)
+               size = 1;
+       return (malloc(size));
 }
 
 static void
 default_memfree(void *arg, void *ptr) {
-        UNUSED(arg);
-        free(ptr);
+       UNUSED(arg);
+       free(ptr);
 }
 
 isc_result_t

diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
index 18f8ec17b21c39afe6f154c6aa957f125fa9de01..cc9654b4ddcfde81457cfc958a01b352df51efd9 100644 (file)
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/Makefile.in
@@ -1,7 +1,7 @@
-# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
-# Permission to use, copy, modify, and distribute this software for any
+# 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.
 #
@@ -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.50.18.1 2008/11/20 01:49:22 marka Exp $
+# $Id: Makefile.in,v 1.50.18.2 2008/11/20 23:46:03 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index c60c4ae390761d3cb625ae5d3a7010f6a735c42e..00c6bc087fb9b0605857d717590d595e9baac766 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.119.18.42 2008/11/20 02:02:44 marka Exp $ */
+/* $Id: validator.c,v 1.119.18.43 2008/11/20 23:46:03 tbox Exp $ */
 
 /*! \file */
 
@@ -1134,7 +1134,7 @@ get_key(dns_validator_t *val, dns_rdata_rrsig_t *siginfo) {
                        return (DNS_R_CONTINUE);
        } else {
                /*
-                * SOA and NS RRsets can only be signed by a key with   
+                * SOA and NS RRsets can only be signed by a key with
                 * the same name.
                 */
                if (val->event->rdataset->type == dns_rdatatype_soa ||