update copyright notice

diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c
index b7431c2d76d065844a1353165cd36571fdddd950..1b60e06b58d599e50e40c0fb98fa49e34201aa12 100644 (file)
--- a/bin/dnssec/dnssec-keyfromlabel.c
+++ b/bin/dnssec/dnssec-keyfromlabel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2007-2010  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-keyfromlabel.c,v 1.29.8.1 2010/01/19 20:25:49 each Exp $ */
+/* $Id: dnssec-keyfromlabel.c,v 1.29.8.2 2010/01/19 23:48:12 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/dnssec/dnssec-keyfromlabel.docbook b/bin/dnssec/dnssec-keyfromlabel.docbook
index cc05b0c12c188f22d52c905a7e03cbde2d796acd..f0197d49dd398b13c93079de17c8534cb4b40f5b 100644 (file)
--- a/bin/dnssec/dnssec-keyfromlabel.docbook
+++ b/bin/dnssec/dnssec-keyfromlabel.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
               [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008-2010  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: dnssec-keyfromlabel.docbook,v 1.15.24.1 2010/01/19 20:25:49 each Exp $ -->
+<!-- $Id: dnssec-keyfromlabel.docbook,v 1.15.24.2 2010/01/19 23:48:12 tbox Exp $ -->
 <refentry id="man.dnssec-keyfromlabel">
   <refentryinfo>
     <date>February 8, 2008</date>
@@ -38,6 +38,7 @@
     <copyright>
       <year>2008</year>
       <year>2009</year>
+      <year>2010</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 20a22b549cc4f15a697688d116ad778dcbf5c8f3..79484ffc3459d69d181e02f52c65b9f483b85dff 100644 (file)
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-keygen.c,v 1.108.8.3 2010/01/19 20:25:49 each Exp $ */
+/* $Id: dnssec-keygen.c,v 1.108.8.4 2010/01/19 23:48:12 tbox Exp $ */
 
 /*! \file */
 
@@ -826,9 +826,9 @@ main(int argc, char **argv) {
                                  alg, mctx, NULL)) {
                        conflict = ISC_TRUE;
                        if (null_key) {
-                                dst_key_free(&key);
+                               dst_key_free(&key);
                                break;
-                        }
+                       }
 
                        if (verbose > 0) {
                                isc_buffer_clear(&buf);

diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index 4f500359eede8c9f350310af9a9dfef55888ac60..443293562253e163c9a9b6dc0cba8b7ca2825771 100644 (file)
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 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: dnssectool.c,v 1.58.36.1 2010/01/19 20:25:49 each Exp $ */
+/* $Id: dnssectool.c,v 1.58.36.2 2010/01/19 23:48:13 tbox Exp $ */
 
 /*! \file */
 
@@ -414,7 +414,7 @@ key_collision(isc_uint16_t id, dns_name_t *name, const char *dir,
        dns_dnsseckeylist_t matchkeys;
        dns_dnsseckey_t *key = NULL;
        isc_uint16_t oldid, diff;
-        isc_uint16_t bits = DNS_KEYFLAG_REVOKE;   /* flag bits to look for */
+       isc_uint16_t bits = DNS_KEYFLAG_REVOKE;   /* flag bits to look for */
 
        if (exact != NULL)
                *exact = ISC_FALSE;
@@ -435,16 +435,16 @@ key_collision(isc_uint16_t id, dns_name_t *name, const char *dir,
                        conflict = ISC_TRUE;
                        if (diff != 0) {
                                if (verbose > 1)
-                                        fprintf(stderr, "Key ID %d could "
+                                       fprintf(stderr, "Key ID %d could "
                                                "collide with %d\n",
                                                id, oldid);
                        } else {
                                if (exact != NULL)
                                        *exact = ISC_TRUE;
                                if (verbose > 1)
-                                        fprintf(stderr, "Key ID %d exists\n",
+                                       fprintf(stderr, "Key ID %d exists\n",
                                                id);
-                        }
+                       }
                }
 
  next:
@@ -452,7 +452,7 @@ key_collision(isc_uint16_t id, dns_name_t *name, const char *dir,
                dns_dnsseckey_destroy(mctx, &key);
        }
 
-        /* Finish freeing the list */
+       /* Finish freeing the list */
        while (!ISC_LIST_EMPTY(matchkeys)) {
                key = ISC_LIST_HEAD(matchkeys);
                ISC_LIST_UNLINK(matchkeys, key, link);

diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h
index 00193b4f53343283008799e85d84a2dc2af05ee0..a50a85a15033d18eae541d2f95ae81d1d7df7484 100644 (file)
--- a/bin/dnssec/dnssectool.h
+++ b/bin/dnssec/dnssectool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 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: dnssectool.h,v 1.29.36.1 2010/01/19 20:25:49 each Exp $ */
+/* $Id: dnssectool.h,v 1.29.36.2 2010/01/19 23:48:13 tbox Exp $ */
 
 #ifndef DNSSECTOOL_H
 #define DNSSECTOOL_H 1