update copyright notice

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index b729489281a3f676309a62e31d11921e4cd381b8..7cf751ff82888bacc3243255bd6eb654c9cf81db 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.234 2010/03/04 05:18:04 marka Exp $ */
+/* $Id: dig.c,v 1.235 2010/03/04 23:50:34 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 6ebcd37d5434407d6fe2d240c4aafb571f067022..d64d038b500dd242c38264606b9bb89fd0b0844d 100644 (file)
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
               [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dig.docbook,v 1.46 2010/03/04 05:18:04 marka Exp $ -->
+<!-- $Id: dig.docbook,v 1.47 2010/03/04 23:50:34 tbox Exp $ -->
 <refentry id="man.dig">
 
   <refentryinfo>
@@ -44,6 +44,7 @@
       <year>2007</year>
       <year>2008</year>
       <year>2009</year>
+      <year>2010</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index f9471314cba5829da2dc99138869e343bd9fa4ea..542b62e42510819ff2aa084e7fca88276f2b73ff 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.174 2010/03/04 05:24:56 marka Exp $ */
+/* $Id: nsupdate.c,v 1.175 2010/03/04 23:50:34 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index cbf297836c700003fb632cb7eecfb738748ea567..bf38cd7454de51025db4f55be3cac4b7972614ad 100644 (file)
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 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: runall.sh,v 1.9 2010/03/04 20:34:16 marka Exp $
+# $Id: runall.sh,v 1.10 2010/03/04 23:50:34 tbox Exp $
 
 #
 # Run all the system tests.

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index b6ca21821bc0ad5ae89475ce9b8a9efb462227bd..b678635bd57cf76176dc349babc9370559a04aa9 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.115 2010/03/04 06:17:01 marka Exp $ */
+/* $Id: check.c,v 1.116 2010/03/04 23:50:34 tbox Exp $ */
 
 /*! \file */
 
@@ -1755,48 +1755,48 @@ check_trusted_key(const cfg_obj_t *key, isc_boolean_t managed,
        isc_uint32_t flags, proto, alg;
        unsigned char keydata[4096];
 
-        flags = cfg_obj_asuint32(cfg_tuple_get(key, "flags"));
-        proto = cfg_obj_asuint32(cfg_tuple_get(key, "protocol"));
-        alg = cfg_obj_asuint32(cfg_tuple_get(key, "algorithm"));
-        keyname = dns_fixedname_name(&fkeyname);
-        keynamestr = cfg_obj_asstring(cfg_tuple_get(key, "name"));
+       flags = cfg_obj_asuint32(cfg_tuple_get(key, "flags"));
+       proto = cfg_obj_asuint32(cfg_tuple_get(key, "protocol"));
+       alg = cfg_obj_asuint32(cfg_tuple_get(key, "algorithm"));
+       keyname = dns_fixedname_name(&fkeyname);
+       keynamestr = cfg_obj_asstring(cfg_tuple_get(key, "name"));
 
-        if (flags > 0xffff) {
-                cfg_obj_log(key, logctx, ISC_LOG_WARNING,
+       if (flags > 0xffff) {
+               cfg_obj_log(key, logctx, ISC_LOG_WARNING,
                            "flags too big: %u\n", flags);
                result = ISC_R_FAILURE;
        }
-        if (proto > 0xff) {
-                cfg_obj_log(key, logctx, ISC_LOG_WARNING,
+       if (proto > 0xff) {
+               cfg_obj_log(key, logctx, ISC_LOG_WARNING,
                            "protocol too big: %u\n", proto);
                result = ISC_R_FAILURE;
        }
-        if (alg > 0xff) {
-                cfg_obj_log(key, logctx, ISC_LOG_WARNING,
+       if (alg > 0xff) {
+               cfg_obj_log(key, logctx, ISC_LOG_WARNING,
                            "algorithm too big: %u\n", alg);
                result = ISC_R_FAILURE;
        }
 
        if (managed) {
-                const char *initmethod;
-                initmethod = cfg_obj_asstring(cfg_tuple_get(key, "init"));
-
-                if (strcasecmp(initmethod, "initial-key") != 0) {
-                        cfg_obj_log(key, logctx, ISC_LOG_ERROR,
-                                    "managed key '%s': "
-                                    "invalid initialization method '%s'",
-                                    keynamestr, initmethod);
-                        result = ISC_R_FAILURE;
+               const char *initmethod;
+               initmethod = cfg_obj_asstring(cfg_tuple_get(key, "init"));
+
+               if (strcasecmp(initmethod, "initial-key") != 0) {
+                       cfg_obj_log(key, logctx, ISC_LOG_ERROR,
+                                   "managed key '%s': "
+                                   "invalid initialization method '%s'",
+                                   keynamestr, initmethod);
+                       result = ISC_R_FAILURE;
                }
        }
 
-        isc_buffer_init(&keydatabuf, keydata, sizeof(keydata));
+       isc_buffer_init(&keydatabuf, keydata, sizeof(keydata));
 
-        keystr = cfg_obj_asstring(cfg_tuple_get(key, "key"));
-        tresult = isc_base64_decodestring(keystr, &keydatabuf);
+       keystr = cfg_obj_asstring(cfg_tuple_get(key, "key"));
+       tresult = isc_base64_decodestring(keystr, &keydatabuf);
 
        if (tresult != ISC_R_SUCCESS) {
-                cfg_obj_log(key, logctx, ISC_LOG_ERROR,
+               cfg_obj_log(key, logctx, ISC_LOG_ERROR,
                            "%s", isc_result_totext(tresult));
                result = ISC_R_FAILURE;
        } else {

diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index 54ab11bc419385d2cf6f1b024a988cef7dbceb38..25aceb13093f39cfcb362e057e41076b8868f54e 100644 (file)
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.h,v 1.131 2010/03/04 05:18:04 marka Exp $ */
+/* $Id: message.h,v 1.132 2010/03/04 23:50:34 tbox Exp $ */
 
 #ifndef DNS_MESSAGE_H
 #define DNS_MESSAGE_H 1

diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h
index 69b72b3cd1fbccd6532bc2490650c2a066608059..8c792ddd57747cf34291ddc1554697d7a35b5be1 100644 (file)
--- a/lib/dns/include/dns/request.h
+++ b/lib/dns/include/dns/request.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: request.h,v 1.30 2010/03/04 05:24:56 marka Exp $ */
+/* $Id: request.h,v 1.31 2010/03/04 23:50:34 tbox Exp $ */
 
 #ifndef DNS_REQUEST_H
 #define DNS_REQUEST_H 1

diff --git a/lib/dns/message.c b/lib/dns/message.c
index 42b783ee4a072ccd2438813061c5a5b2b0c64b1c..1bbfe3ab8b1f8b7ad94e1a8457310c72ea0912f8 100644 (file)
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.250 2010/03/04 05:18:04 marka Exp $ */
+/* $Id: message.c,v 1.251 2010/03/04 23:50:34 tbox Exp $ */
 
 /*! \file */
 
@@ -3144,7 +3144,7 @@ dns_message_sectiontotext(dns_message_t *msg, dns_section_t section,
                for (rdataset = ISC_LIST_HEAD(name->list);
                     rdataset != NULL;
                     rdataset = ISC_LIST_NEXT(rdataset, link)) {
-                       if (section == DNS_SECTION_ANSWER && 
+                       if (section == DNS_SECTION_ANSWER &&
                            rdataset->type == dns_rdatatype_soa) {
                                if ((flags & DNS_MESSAGETEXTFLAG_OMITSOA) != 0)
                                        continue;

diff --git a/lib/dns/request.c b/lib/dns/request.c
index fbe5f3527b69430c16d3d12691172f1f09192339..860af00db7b391c554aa9a15d876fdd48fac4385 100644 (file)
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: request.c,v 1.86 2010/03/04 05:24:56 marka Exp $ */
+/* $Id: request.c,v 1.87 2010/03/04 23:50:34 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 86cdd33a7a990a2a30a3e8be31e1e8aa5f200987..fb3c5b5df872f81ebf58c6e2d534a68308119201 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.186 2010/03/04 22:25:31 marka Exp $ */
+/* $Id: validator.c,v 1.187 2010/03/04 23:50:34 tbox Exp $ */
 
 #include <config.h>
 
@@ -3910,7 +3910,7 @@ dns_validator_cancel(dns_validator_t *validator) {
 
        if ((validator->attributes & VALATTR_CANCELED) == 0) {
                validator->attributes |= VALATTR_CANCELED;
-               if (validator->event != NULL) {
+               if (validator->event != NULL) {
                        if (validator->fetch != NULL)
                                dns_resolver_cancelfetch(validator->fetch);
 

diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
index 70d1c81dc06638f02433fc2571a1665d8f478e1f..714e43fc782b64d5a2c27a495a47734c73d88027 100644 (file)
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.h,v 1.87 2010/03/04 05:45:51 marka Exp $ */
+/* $Id: mem.h,v 1.88 2010/03/04 23:50:34 tbox Exp $ */
 
 #ifndef ISC_MEM_H
 #define ISC_MEM_H 1

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 6530892727e0baf4b8013fa7c3afc1794248f111..5b11d08dcfb70268bb45d06f784c9c83e4e070a0 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.c,v 1.154 2010/03/04 05:29:15 marka Exp $ */
+/* $Id: mem.c,v 1.155 2010/03/04 23:50:34 tbox Exp $ */
 
 /*! \file */