update copyright notice

diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index d8c4ea48659bd9146ba30aeef3014e599ecc1ac0..a1b3f600bb318b0a304e439eb7e2580a98dfc441 100644 (file)
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssectool.c,v 1.57 2009/10/26 21:18:24 each Exp $ */
+/* $Id: dnssectool.c,v 1.58 2009/10/26 23:47:35 tbox Exp $ */
 
 /*! \file */
 
@@ -370,9 +370,9 @@ void
 check_keyversion(dst_key_t *key, char *keystr) {
        int major, minor;
        dst_key_getprivateformat(key, &major, &minor);
-        INSIST(major <= DST_MAJOR_VERSION); /* invalid private key */
+       INSIST(major <= DST_MAJOR_VERSION); /* invalid private key */
 
-       if (major < DST_MAJOR_VERSION || minor < DST_MINOR_VERSION) 
+       if (major < DST_MAJOR_VERSION || minor < DST_MINOR_VERSION)
                fatal("Key %s has incompatible format version %d.%d, "
                      "use -f to force upgrade to new version.",
                      keystr, major, minor);
@@ -386,7 +386,7 @@ void
 set_keyversion(dst_key_t *key) {
        int major, minor;
        dst_key_getprivateformat(key, &major, &minor);
-        INSIST(major <= DST_MAJOR_VERSION);
+       INSIST(major <= DST_MAJOR_VERSION);
 
        if (major != DST_MAJOR_VERSION || minor != DST_MINOR_VERSION)
                dst_key_setprivateformat(key, DST_MAJOR_VERSION,

diff --git a/bin/named/query.c b/bin/named/query.c
index d15ac5a8e7676f4ba146751fd5ade5bcad342dc2..d24b2f85eda4471767f270f0a45217bbe5c5879c 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.329 2009/10/26 23:14:53 each Exp $ */
+/* $Id: query.c,v 1.330 2009/10/26 23:47:35 tbox Exp $ */
 
 /*! \file */
 
@@ -4639,7 +4639,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
        if (type == dns_rdatatype_any) {
 #ifdef ALLOW_FILTER_AAAA_ON_V4
                isc_boolean_t have_aaaa, have_a, have_sig;
-               
+
                /*
                 * The filter-aaaa-on-v4 option should
                 * suppress AAAAs for IPv4 clients if there is an A.
@@ -4882,7 +4882,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
                                            NS_CLIENTATTR_FILTER_AAAA_RC) != 0) {
                                client->attributes &=
                                            ~NS_CLIENTATTR_FILTER_AAAA_RC;
-                               client->attributes |= 
+                               client->attributes |=
                                            NS_CLIENTATTR_FILTER_AAAA;
                                dns_rdataset_disassociate(rdataset);
                                if (sigrdataset != NULL &&

diff --git a/bin/pkcs11/unix/unix.c b/bin/pkcs11/unix/unix.c
index 95ad8608964a1caeae923e123a53238fc5f10576..38473981f0082a9c73ef0f068bfe193c84d6c0d0 100644 (file)
--- a/bin/pkcs11/unix/unix.c
+++ b/bin/pkcs11/unix/unix.c
@@ -5,15 +5,17 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC AND NETWORK ASSOCIATES DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE
- * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
- * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
+/* $Id: unix.c,v 1.4 2009/10/26 23:47:35 tbox Exp $ */
+
 /* $Id */
 
 /*! \file */

diff --git a/bin/pkcs11/win32/win32.c b/bin/pkcs11/win32/win32.c
index 289d5529f15c5c20c52e493db96a59c9b0d8d8f9..d302060f5b2f600ba5901f8a2b62de9ccd6450a2 100644 (file)
--- a/bin/pkcs11/win32/win32.c
+++ b/bin/pkcs11/win32/win32.c
@@ -5,15 +5,17 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC AND NETWORK ASSOCIATES DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE
- * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
- * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
+/* $Id: win32.c,v 1.5 2009/10/26 23:47:35 tbox Exp $ */
+
 /* $Id */
 
 /*! \file */

diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index da59409d546967c23e8d6f2b007e7f639f742f69..c51d2e33dc8ace9f609820b785401c4ee21fc9d6 100644 (file)
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.h,v 1.129 2009/10/26 23:14:54 each Exp $ */
+/* $Id: message.h,v 1.130 2009/10/26 23:47:35 tbox Exp $ */
 
 #ifndef DNS_MESSAGE_H
 #define DNS_MESSAGE_H 1
@@ -175,7 +175,7 @@ typedef int dns_messagetextflag_t;
                                                  additional section. */
 #ifdef ALLOW_FILTER_AAAA_ON_V4
 #define DNS_MESSAGERENDER_FILTER_AAAA  0x0020  /*%< filter AAAA records */
-#endif 
+#endif
 
 typedef struct dns_msgblock dns_msgblock_t;