update copyright notice

diff --git a/bin/dnssec/dnssec-dsfromkey.8 b/bin/dnssec/dnssec-dsfromkey.8
index 4190cb795ba9c4d2aab9925a7508f18d5f13d770..cf977fb5b647f1f68f60699bf86b993a77976cd9 100644 (file)
--- a/bin/dnssec/dnssec-dsfromkey.8
+++ b/bin/dnssec/dnssec-dsfromkey.8
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2008, 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
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: dnssec-dsfromkey.8,v 1.7 2009/06/17 23:12:07 tbox Exp $
+.\" $Id: dnssec-dsfromkey.8,v 1.8 2009/06/17 23:53:04 tbox Exp $
 .\"
 .hy 0
 .ad l

diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c
index 8ffba7b531948e74ec6b64d837d744a862bddbd1..a92b742443a92743127e4748c03a61f4ad0eaafa 100644 (file)
--- a/bin/dnssec/dnssec-dsfromkey.c
+++ b/bin/dnssec/dnssec-dsfromkey.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-dsfromkey.c,v 1.7 2009/06/17 06:51:43 each Exp $ */
+/* $Id: dnssec-dsfromkey.c,v 1.8 2009/06/17 23:53:04 tbox Exp $ */
 
 /*! \file */
 
@@ -78,18 +78,18 @@ loadkeys(char *dirname, char *setname)
 
        isc_buffer_init(&buf, filename, sizeof(filename));
        if (dirname != NULL) {
-                if (isc_buffer_availablelength(&buf) < strlen(dirname))
-                        fatal("directory name '%s' too long", dirname);
+               if (isc_buffer_availablelength(&buf) < strlen(dirname))
+                       fatal("directory name '%s' too long", dirname);
                isc_buffer_putstr(&buf, dirname);
                if (dirname[strlen(dirname) - 1] != '/') {
-                        if (isc_buffer_availablelength(&buf) < 1)
-                                fatal("directory name '%s' too long", dirname);
+                       if (isc_buffer_availablelength(&buf) < 1)
+                               fatal("directory name '%s' too long", dirname);
                        isc_buffer_putstr(&buf, "/");
-                }
+               }
        }
 
-        if (isc_buffer_availablelength(&buf) < strlen("keyset-"))
-                fatal("directory name '%s' too long", dirname);
+       if (isc_buffer_availablelength(&buf) < strlen("keyset-"))
+               fatal("directory name '%s' too long", dirname);
        isc_buffer_putstr(&buf, "keyset-");
        result = dns_name_tofilenametext(name, ISC_FALSE, &buf);
        check_result(result, "dns_name_tofilenametext()");
@@ -297,7 +297,7 @@ main(int argc, char **argv) {
        isc_commandline_errprint = ISC_FALSE;
 
        while ((ch = isc_commandline_parse(argc, argv,
-                                          "12a:c:d:l:sv:Fh")) != -1) {
+                                          "12a:c:d:l:sv:Fh")) != -1) {
                switch (ch) {
                case '1':
                        dtype = DNS_DSDIGEST_SHA1;

diff --git a/bin/dnssec/dnssec-dsfromkey.docbook b/bin/dnssec/dnssec-dsfromkey.docbook
index b3f8e799709f3dd4f7012d42c4216afcc54b62dd..bd8f468b4df472d9d1fd06c983feb951183a1a20 100644 (file)
--- a/bin/dnssec/dnssec-dsfromkey.docbook
+++ b/bin/dnssec/dnssec-dsfromkey.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
                [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008, 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: dnssec-dsfromkey.docbook,v 1.7 2009/06/17 06:51:43 each Exp $ -->
+<!-- $Id: dnssec-dsfromkey.docbook,v 1.8 2009/06/17 23:53:04 tbox Exp $ -->
 <refentry id="man.dnssec-dsfromkey">
   <refentryinfo>
     <date>November 29, 2008</date>
@@ -37,6 +37,7 @@
   <docinfo>
     <copyright>
       <year>2008</year>
+      <year>2009</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>

diff --git a/bin/dnssec/dnssec-dsfromkey.html b/bin/dnssec/dnssec-dsfromkey.html
index 72fea92aa44d8d19b85c40bfe1c8ef468dd6b98b..ae807e6433df59ffc4ebe7fb046929a7a92babd9 100644 (file)
--- a/bin/dnssec/dnssec-dsfromkey.html
+++ b/bin/dnssec/dnssec-dsfromkey.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008, 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
@@ -14,7 +14,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-dsfromkey.html,v 1.7 2009/06/17 23:12:08 tbox Exp $ -->
+<!-- $Id: dnssec-dsfromkey.html,v 1.8 2009/06/17 23:53:04 tbox Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 9a61551da78db966961a1638fd7c862e7b82bba2..3f521b2d6d9e57cab0825f844b8e05dad838faf2 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.84 2009/06/17 06:51:43 each Exp $ */
+/* $Id: dnssec-keygen.c,v 1.85 2009/06/17 23:53:04 tbox Exp $ */
 
 /*! \file */
 
@@ -263,7 +263,7 @@ main(int argc, char **argv) {
                                "defaulting to %s\n", algname);
        }
 
-        if (strcasecmp(algname, "RSA") == 0) {
+       if (strcasecmp(algname, "RSA") == 0) {
                fprintf(stderr, "The use of RSA (RSAMD5) is not recommended.\n"
                                "If you still wish to use RSA (RSAMD5) please "
                                "specify \"-a RSAMD5\"\n");
@@ -315,8 +315,8 @@ main(int argc, char **argv) {
        if (size < 0) {
                if (use_default) {
                        size = (ksk != 0) ? 2048 : 1024;
-                        if (verbose > 0)
-                                fprintf(stderr, "key size not specified; "
+                       if (verbose > 0)
+                               fprintf(stderr, "key size not specified; "
                                        "defaulting to %d\n", size);
                } else {
                        fatal("key size not specified (-b option)");

diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook
index f2159cbd0df510ec4763d9bc2d2651d566ecef00..903da941a760e2691d50c6ab6fc9ee925f04affb 100644 (file)
--- a/bin/dnssec/dnssec-keygen.docbook
+++ b/bin/dnssec/dnssec-keygen.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
               [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004, 2005, 2007-2009  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: dnssec-keygen.docbook,v 1.23 2009/06/17 06:51:43 each Exp $ -->
+<!-- $Id: dnssec-keygen.docbook,v 1.24 2009/06/17 23:53:04 tbox Exp $ -->
 <refentry id="man.dnssec-keygen">
   <refentryinfo>
     <date>June 30, 2000</date>
@@ -41,6 +41,7 @@
       <year>2005</year>
       <year>2007</year>
       <year>2008</year>
+      <year>2009</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>