update copyright notice

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index f247e6494021be138d871bb1a6b2e0604cab3b45..811b7bdd8bb1c0b19bce742a14b2ae35db3f0589 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.5 2010/08/16 22:27:16 marka Exp $ */
+/* $Id: dnssec-keygen.c,v 1.108.8.6 2010/08/16 23:46:30 tbox Exp $ */
 
 /*! \file */
 
@@ -553,7 +553,7 @@ main(int argc, char **argv) {
                        else if (strcasecmp(type, "NOCONF") == 0)
                                flags |= DNS_KEYTYPE_NOCONF;
                        else if (strcasecmp(type, "NOAUTHCONF") == 0) {
-                               flags |= (DNS_KEYTYPE_NOAUTH | 
+                               flags |= (DNS_KEYTYPE_NOAUTH |
                                          DNS_KEYTYPE_NOCONF);
                                if (size < 0)
                                        size = 0;
@@ -660,7 +660,7 @@ main(int argc, char **argv) {
                        fatal("Key %s has no inactivation date.\n\t"
                              "You must use dnssec-settime -I to set one "
                              "before generating a successor.", keystr);
-               
+
                publish = activate - prepub;
                if (publish < now)
                        fatal("Key %s becomes inactive\n\t"
@@ -676,10 +676,10 @@ main(int argc, char **argv) {
                        fprintf(stderr, "%s: WARNING: Key %s has no removal "
                                        "date;\n\t it will remain in the zone "
                                        "indefinitely after rollover.\n\t "
-                                        "You can use dnssec-settime -D to "
-                                        "change this.\n", program, keystr);
+                                       "You can use dnssec-settime -D to "
+                                       "change this.\n", program, keystr);
 
-                setpub = setact = ISC_TRUE;
+               setpub = setact = ISC_TRUE;
        }
 
        switch (alg) {
@@ -997,7 +997,7 @@ main(int argc, char **argv) {
        ret = dst_key_buildfilename(key, 0, NULL, &buf);
        printf("%s\n", filename);
        dst_key_free(&key);
-        if (prevkey != NULL)
+       if (prevkey != NULL)
                dst_key_free(&prevkey);
 
        cleanup_logging(&log);

diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook
index bc285e1d860526380a610174f5b0d3c4798a28fd..07da514a4ce3b38f1fd6cc59f41285d6b29508ff 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-2009  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004, 2005, 2007-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: dnssec-keygen.docbook,v 1.33.24.1 2010/08/16 22:27:16 marka Exp $ -->
+<!-- $Id: dnssec-keygen.docbook,v 1.33.24.2 2010/08/16 23:46:30 tbox Exp $ -->
 <refentry id="man.dnssec-keygen">
   <refentryinfo>
     <date>June 30, 2000</date>
@@ -42,6 +42,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/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c
index 28b879182437e09b65c1289bed2df7bd903a5aa8..019705a84fb70326754aaa8cd82b21dea2a26323 100644 (file)
--- a/bin/dnssec/dnssec-settime.c
+++ b/bin/dnssec/dnssec-settime.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-settime.c,v 1.19.34.7 2010/08/16 22:27:16 marka Exp $ */
+/* $Id: dnssec-settime.c,v 1.19.34.8 2010/08/16 23:46:30 tbox Exp $ */
 
 /*! \file */
 
@@ -353,7 +353,7 @@ main(int argc, char **argv) {
                        fatal("-S and -A cannot be used together");
 
                result = dst_key_fromnamedfile(predecessor, directory,
-                                              DST_TYPE_PUBLIC | 
+                                              DST_TYPE_PUBLIC |
                                               DST_TYPE_PRIVATE,
                                               mctx, &prevkey);
                if (result != ISC_R_SUCCESS)
@@ -384,7 +384,7 @@ main(int argc, char **argv) {
                        fatal("Predecessor has no inactivation date. "
                              "You must set one before\n\t"
                              "generating a successor.");
-               
+
                pub = act - prepub;
                if (pub < now)
                        fatal("Predecessor will become inactive before the\n\t"
@@ -401,7 +401,7 @@ main(int argc, char **argv) {
                                        "indefinitely after rollover.\n",
                                        program);
 
-                changed = setpub = setact = ISC_TRUE;
+               changed = setpub = setact = ISC_TRUE;
                dst_key_free(&prevkey);
        } else {
                if (prepub < 0)

diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h
index 1c53edadfa2489096b3f6a128f1d79292e97c334..2f28942dec86a0f1904b30715de187ff8c87c651 100644 (file)
--- a/bin/named/include/named/server.h
+++ b/bin/named/include/named/server.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.h,v 1.104.8.5 2010/08/16 22:27:17 marka Exp $ */
+/* $Id: server.h,v 1.104.8.6 2010/08/16 23:46:30 tbox Exp $ */
 
 #ifndef NAMED_SERVER_H
 #define NAMED_SERVER_H 1
@@ -295,7 +295,7 @@ ns_server_freeze(ns_server_t *server, isc_boolean_t freeze, char *args,
                 isc_buffer_t *text);
 
 /*%
- * Update a zone's DNSKEY set from the key repository.  If 
+ * Update a zone's DNSKEY set from the key repository.  If
  * the command that triggered the call to this function was "sign",
  * then force a full signing of the zone.  If it was "loadkeys",
  * then don't sign the zone; any needed changes to signatures can

diff --git a/bin/named/server.c b/bin/named/server.c
index d2c6d606d585c39125b73e31489ae24f15851d28..3e9a1a7f96a76ed9dd6c8c273768459318afe470 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.556.8.24 2010/08/16 22:27:16 marka Exp $ */
+/* $Id: server.c,v 1.556.8.25 2010/08/16 23:46:30 tbox Exp $ */
 
 /*! \file */
 
@@ -6493,7 +6493,7 @@ ns_server_rekey(ns_server_t *server, char *args) {
 
        keyopts = dns_zone_getkeyopts(zone);
 
-        /* "rndc loadkeys" requires "auto-dnssec maintain". */
+       /* "rndc loadkeys" requires "auto-dnssec maintain". */
        if ((keyopts & DNS_ZONEKEY_ALLOW) == 0)
                result = ISC_R_NOPERM;
        else if ((keyopts & DNS_ZONEKEY_MAINTAIN) == 0 && !fullsign)

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index aac1b329aaf055ae07aaf41081347a873c1a48e8..5a6f02cd9c8afe64b0133f3b7e21f62ae288f5f6 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.540.2.28 2010/08/16 22:27:17 marka Exp $ */
+/* $Id: zone.c,v 1.540.2.29 2010/08/16 23:46:30 tbox Exp $ */
 
 /*! \file */
 
@@ -13940,7 +13940,7 @@ zone_rekey(dns_zone_t *zone) {
                                             dns_result_totext(result));
                                }
                        }
-                }
+               }
 
 
                if (fullsign) {
@@ -13984,7 +13984,7 @@ zone_rekey(dns_zone_t *zone) {
                                        continue;
 
                                result = dns_rdata_tostruct(&tuple->rdata,
-                                                           &dnskey, NULL);
+                                                           &dnskey, NULL);
                                RUNTIME_CHECK(result == ISC_R_SUCCESS);
                                dns_rdata_toregion(&tuple->rdata, &r);
                                algorithm = dnskey.algorithm;
@@ -14002,11 +14002,11 @@ zone_rekey(dns_zone_t *zone) {
                        }
                }
 
-                /*
-                 * Clear fullsign flag, if it was set, so we don't do
-                 * another full signing next time
-                 */
-                zone->keyopts &= ~DNS_ZONEKEY_FULLSIGN;
+               /*
+                * Clear fullsign flag, if it was set, so we don't do
+                * another full signing next time
+                */
+               zone->keyopts &= ~DNS_ZONEKEY_FULLSIGN;
 
                /*
                 * Cause the zone to add/delete NSEC3 chains for the

diff --git a/lib/lwres/print_p.h b/lib/lwres/print_p.h
index 59a5a9758c96d8660e179340af5496077cdb1653..42ed36c76a6d7a5e236a2186ff144737ad41941d 100644 (file)
--- a/lib/lwres/print_p.h
+++ b/lib/lwres/print_p.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-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: print_p.h,v 1.4.558.1 2010/08/16 22:39:36 marka Exp $ */
+/* $Id: print_p.h,v 1.4.558.2 2010/08/16 23:46:31 tbox Exp $ */
 
 #ifndef LWRES_PRINT_P_H
 #define LWRES_PRINT_P_H 1
@@ -47,7 +47,7 @@
 
 #ifdef __GNUC__
 #define LWRES_FORMAT_PRINTF(fmt, args) \
-        __attribute__((__format__(__printf__, fmt, args)))
+       __attribute__((__format__(__printf__, fmt, args)))
 #else
 #define LWRES_FORMAT_PRINTF(fmt, args)
 #endif