update copyright notice

diff --git a/lib/dns/diff.c b/lib/dns/diff.c
index 79ce1c8d23b75f44532684c9ceb3e299b1467e70..60a1708ad8adba90e4ea5850aba62b16fa2b97b0 100644 (file)
--- a/lib/dns/diff.c
+++ b/lib/dns/diff.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: diff.c,v 1.9.18.5 2009/01/05 23:46:19 tbox Exp $ */
+/* $Id: diff.c,v 1.9.18.6 2009/01/06 23:45:56 tbox Exp $ */
 
 /*! \file */
 
@@ -269,7 +269,7 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver,
                                                      sizeof(classbuf));
                                if (t->ttl != rdl.ttl && warn)
                                        isc_log_write(DIFF_COMMON_LOGARGS,
-                                               ISC_LOG_WARNING,
+                                               ISC_LOG_WARNING,
                                                "'%s/%s/%s': TTL differs in "
                                                "rdataset, adjusting "
                                                "%lu -> %lu",
@@ -306,7 +306,7 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver,
                                INSIST(0);
                        }
                        if (result == DNS_R_UNCHANGED) {
-                               /*
+                               /*
                                 * This will not happen when executing a
                                 * dynamic update, because that code will
                                 * generate strictly minimal diffs.

diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index c248a2ed36b7f81e5e4b58fe6b95c03217203279..81e396e423e7ca4ab7d2a497b5fc9e49d035bcf1 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db.h,v 1.76.18.12 2009/01/05 23:46:20 tbox Exp $ */
+/* $Id: db.h,v 1.76.18.13 2009/01/06 23:45:57 tbox Exp $ */
 
 #ifndef DNS_DB_H
 #define DNS_DB_H 1
@@ -153,7 +153,7 @@ typedef isc_result_t
                      dns_dbtype_t type, dns_rdataclass_t rdclass,
                      unsigned int argc, char *argv[], void *driverarg,
                      dns_db_t **dbp);
-                                       
+
 #define DNS_DB_MAGIC           ISC_MAGIC('D','N','S','D')
 #define DNS_DB_VALID(db)       ISC_MAGIC_VALID(db, DNS_DB_MAGIC)
 
@@ -786,7 +786,7 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
  *                                             the negative caching proof.
  *
  *     \li     #DNS_R_EMPTYNAME                        The name exists but there is
- *                                             no data at the name. 
+ *                                             no data at the name.
  *
  *     \li     #DNS_R_COVERINGNSEC             The returned data is a NSEC
  *                                             that potentially covers 'name'.

diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index c726d40a10ae3bdd5b7333745d573b6985ab1396..4328d6c774baf10334d7363424c0153ae6bdb6da 100644 (file)
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: view.h,v 1.91.18.11 2009/01/05 23:46:20 tbox Exp $ */
+/* $Id: view.h,v 1.91.18.12 2009/01/06 23:45:57 tbox Exp $ */
 
 #ifndef DNS_VIEW_H
 #define DNS_VIEW_H 1
@@ -615,7 +615,7 @@ dns_view_loadnew(dns_view_t *view, isc_boolean_t stop);
 /*%<
  * Load zones attached to this view.  dns_view_load() loads
  * all zones whose master file has changed since the last
- * load; dns_view_loadnew() loads only zones that have never 
+ * load; dns_view_loadnew() loads only zones that have never
  * been loaded.
  *
  * If 'stop' is ISC_TRUE, stop on the first error and return it.
@@ -691,7 +691,7 @@ dns_view_dumpdbtostream(dns_view_t *view, FILE *fp);
  * easily obtainable by other means.
  *
  * Requires:
- *     
+ *
  *\li  'view' is valid.
  *
  *\li  'fp' refers to a file open for writing.
@@ -734,7 +734,7 @@ isc_result_t
 dns_view_adddelegationonly(dns_view_t *view, dns_name_t *name);
 /*%<
  * Add the given name to the delegation only table.
- * 
+ *
  *
  * Requires:
  *\li  'view' is valid.
@@ -749,7 +749,7 @@ isc_result_t
 dns_view_excludedelegationonly(dns_view_t *view, dns_name_t *name);
 /*%<
  * Add the given name to be excluded from the root-delegation-only.
- * 
+ *
  *
  * Requires:
  *\li  'view' is valid.

diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index bc3948a8c020cb13afbe32cfa484d62e93a2a517..832f108c9aca928012c622ecc4cf30131a0847d4 100644 (file)
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.h,v 1.126.18.21 2009/01/05 23:46:20 tbox Exp $ */
+/* $Id: zone.h,v 1.126.18.22 2009/01/06 23:45:57 tbox Exp $ */
 
 #ifndef DNS_ZONE_H
 #define DNS_ZONE_H 1
@@ -1159,7 +1159,7 @@ dns_zone_setnotifytype(dns_zone_t *zone, dns_notifytype_t notifytype);
 
 isc_result_t
 dns_zone_forwardupdate(dns_zone_t *zone, dns_message_t *msg,
-                       dns_updatecallback_t callback, void *callback_arg);
+                      dns_updatecallback_t callback, void *callback_arg);
 /*%<
  * Forward 'msg' to each master in turn until we get an answer or we
  * have exausted the list of masters. 'callback' will be called with
@@ -1363,7 +1363,7 @@ dns_zonemgr_getttransfersperns(dns_zonemgr_t *zmgr);
 void
 dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, isc_uint32_t iolimit);
 /*%<
- *     Set the number of simultaneous file descriptors available for 
+ *     Set the number of simultaneous file descriptors available for
  *     reading and writing masterfiles.
  *
  * Requires:
@@ -1374,7 +1374,7 @@ dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, isc_uint32_t iolimit);
 isc_uint32_t
 dns_zonemgr_getiolimit(dns_zonemgr_t *zmgr);
 /*%<
- *     Get the number of simultaneous file descriptors available for 
+ *     Get the number of simultaneous file descriptors available for
  *     reading and writing masterfiles.
  *
  * Requires:
@@ -1484,7 +1484,7 @@ void
 dns_zone_name(dns_zone_t *zone, char *buf, size_t len);
 /*%<
  * Return the name of the zone with class and view.
- * 
+ *
  * Requires:
  *\li  'zone' to be valid.
  *\li  'buf' to be non NULL.

diff --git a/lib/dns/nsec.c b/lib/dns/nsec.c
index 2353615b0b61bcf8384d47ada9210f4392ae2479..e301d71bd1abe23fb10efba4916ec626d5cb0ffb 100644 (file)
--- a/lib/dns/nsec.c
+++ b/lib/dns/nsec.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 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: nsec.c,v 1.5.20.3 2009/01/06 09:01:49 fdupont Exp $ */
+/* $Id: nsec.c,v 1.5.20.4 2009/01/06 23:45:57 tbox Exp $ */
 
 /*! \file */
 
@@ -197,7 +197,7 @@ dns_nsec_typepresent(dns_rdata_t *nsec, dns_rdatatype_t type) {
        /* This should never fail */
        result = dns_rdata_tostruct(nsec, &nsecstruct, NULL);
        INSIST(result == ISC_R_SUCCESS);
-       
+
        present = ISC_FALSE;
        for (i = 0; i < nsecstruct.len; i += len) {
                INSIST(i + 2 <= nsecstruct.len);

diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h
index 5d999b8c9dbfabcb4df3e4199f22ceb3fc7ec413..2d63754248b475319b5a70d0f30fe022b506e6d4 100644 (file)
--- a/lib/isc/include/isc/log.h
+++ b/lib/isc/include/isc/log.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.47.18.5 2009/01/05 23:46:21 tbox Exp $ */
+/* $Id: log.h,v 1.47.18.6 2009/01/06 23:45:57 tbox Exp $ */
 
 #ifndef ISC_LOG_H
 #define ISC_LOG_H 1
@@ -86,7 +86,7 @@
 /*@}*/
 
 /*!
- * \brief Used to name the categories used by a library.  
+ * \brief Used to name the categories used by a library.
  *
  * An array of isc_logcategory
  * structures names each category, and the id value is initialized by calling
@@ -107,13 +107,13 @@ struct isc_logmodule {
 
 /*%
  * The isc_logfile structure is initialized as part of an isc_logdestination
- * before calling isc_log_createchannel().  
+ * before calling isc_log_createchannel().
  *
  * When defining an #ISC_LOG_TOFILE
  * channel the name, versions and maximum_size should be set before calling
  * isc_log_createchannel().  To define an #ISC_LOG_TOFILEDESC channel set only
  * the stream before the call.
- * 
+ *
  * Setting maximum_size to zero implies no maximum.
  */
 typedef struct isc_logfile {
@@ -527,7 +527,7 @@ isc_log_usechannel(isc_logconfig_t *lcfg, const char *name,
  */
 
 /* Attention: next four comments PRECEED code */
-/*! 
+/*!
  *   \brief
  * Write a message to the log channels.
  *
@@ -634,7 +634,7 @@ ISC_FORMAT_PRINTF(5, 0);
 
 /*%
  * These are four internationalized versions of the isc_log_[v]write[1]
- * functions.  
+ * functions.
  *
  * The only difference is that they take arguments for a message
  * catalog, message set, and message number, all immediately preceding the

diff --git a/lib/isc/log.c b/lib/isc/log.c
index 8622421c4145662e4699f0da42b423a8fa14c7e9..2007fa3fac117d44c5a79bd63eaf330376952186 100644 (file)
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.84.18.10 2009/01/05 23:46:20 tbox Exp $ */
+/* $Id: log.c,v 1.84.18.11 2009/01/06 23:45:57 tbox Exp $ */
 
 /*! \file
  * \author  Principal Authors: DCL */
@@ -1448,7 +1448,7 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
        LOCK(&lctx->lock);
 
        lctx->buffer[0] = '\0';
-       
+
        lcfg = lctx->logconfig;
 
        category_channels = ISC_LIST_HEAD(lcfg->channellists[category->id]);
@@ -1507,7 +1507,7 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
                if ((channel->flags & ISC_LOG_PRINTTIME) != 0 &&
                    time_string[0] == '\0') {
                        isc_time_t isctime;
-                       
+
                        TIME_NOW(&isctime);
                        isc_time_formattimestamp(&isctime, time_string,
                                                 sizeof(time_string));
@@ -1518,9 +1518,9 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
                        if (level < ISC_LOG_CRITICAL)
                                snprintf(level_string, sizeof(level_string),
                                         isc_msgcat_get(isc_msgcat,
-                                                       ISC_MSGSET_LOG,
-                                                       ISC_MSG_LEVEL,
-                                                       "level %d: "),
+                                                       ISC_MSGSET_LOG,
+                                                       ISC_MSG_LEVEL,
+                                                       "level %d: "),
                                         level);
                        else if (level > ISC_LOG_DYNAMIC)
                                snprintf(level_string, sizeof(level_string),
@@ -1700,8 +1700,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
                                printcategory ? category->name  : "",
                                printcategory ? ": "            : "",
                                printmodule   ? (module != NULL ? module->name
-                                                               : "no_module")
-                                                               : "",
+                                                               : "no_module")
+                                                               : "",
                                printmodule   ? ": "            : "",
                                printlevel    ? level_string    : "",
                                lctx->buffer);
@@ -1743,8 +1743,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
                               printcategory ? category->name   : "",
                               printcategory ? ": "             : "",
                               printmodule   ? (module != NULL  ? module->name
-                                                               : "no_module")
-                                                               : "",
+                                                               : "no_module")
+                                                               : "",
                               printmodule   ? ": "             : "",
                               printlevel    ? level_string     : "",
                               lctx->buffer);

diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h
index e44515595cef0768df3c2e6a97355917d3169a7e..739b69204a579026c1c2e5b627e0dc059536b444 100644 (file)
--- a/lib/isc/unix/include/isc/time.h
+++ b/lib/isc/unix/include/isc/time.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.h,v 1.30.18.4 2009/01/05 23:46:21 tbox Exp $ */
+/* $Id: time.h,v 1.30.18.5 2009/01/06 23:45:57 tbox Exp $ */
 
 #ifndef ISC_TIME_H
 #define ISC_TIME_H 1
@@ -29,7 +29,7 @@
  *** Intervals
  ***/
 
-/*! 
+/*!
  *  \brief
  * The contents of this structure are private, and MUST NOT be accessed
  * directly by callers.

diff --git a/util/update_copyrights b/util/update_copyrights
index d44956d4166ad891d03e301ec06dd76f3374c4d0..ec699a0003448764bb0fa55c33df215ea55beedf 100644 (file)
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl -w
 #
-# Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: update_copyrights,v 1.32.18.16 2009/01/06 04:01:45 marka Exp $
+# $Id: update_copyrights,v 1.32.18.17 2009/01/06 23:45:57 tbox Exp $
 
 require 5.002;