update copyright notice

diff --git a/bin/named/client.c b/bin/named/client.c
index 1a7e34327225c80c164c6db3c69c3cc98020e6b7..29ebeeec595ddf380083bdb5b7e535e6d5bb9a9a 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  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: client.c,v 1.270 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: client.c,v 1.271 2011/01/11 23:47:12 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 25e9196f7943e10c059805d2c6ec858d2999fa27..030dc40e211bf120eab05a0c94ae5011ba526a40 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.596 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: server.c,v 1.597 2011/01/11 23:47:12 tbox Exp $ */
 
 /*! \file */
 
@@ -2212,7 +2212,7 @@ configure_view(dns_view_t *view, cfg_parser_t* parser,
                        dns_view_setdynamickeyring(view, ring);
                dns_tsigkeyring_detach(&ring);
                dns_view_detach(&pview);
-       } else 
+       } else
                dns_view_restorekeyring(view);
 
        /*

diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c
index 6a81f1fa4cb0026b5639ecf7e3120659b0c4112f..776b1b9f837dd2fe1576b1d2d8499129bccda366 100644 (file)
--- a/bin/named/tsigconf.c
+++ b/bin/named/tsigconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-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: tsigconf.c,v 1.34 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: tsigconf.c,v 1.35 2011/01/11 23:47:12 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index f077e99f34cd554e10df448bd10472abe6a4cefe..e57ec01e7bc92a5e2af64c591933536d4a73b9c6 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.143 2011/01/11 21:36:22 mgraff Exp $
+# $Id: Makefile.in,v 1.144 2011/01/11 23:47:12 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/atomic/Makefile.in b/bin/tests/atomic/Makefile.in
index 757ad1dbf558fd1b9109f82f710df389a215f569..b7c00465b472d2e7f95d0d5ec7c6fb31309b488e 100644 (file)
--- a/bin/tests/atomic/Makefile.in
+++ b/bin/tests/atomic/Makefile.in
@@ -1,7 +1,6 @@
-# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 1999-2002  Internet Software Consortium.
+# Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 #
-# Permission to use, copy, modify, and distribute this software for any
+# Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 # copyright notice and this permission notice appear in all copies.
 #
@@ -13,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.1 2011/01/11 21:40:35 mgraff Exp $
+# $Id: Makefile.in,v 1.2 2011/01/11 23:47:12 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/atomic/t_atomic.c b/bin/tests/atomic/t_atomic.c
index 0aabccace543c5cc68b22ee6655a6bccfc3b56cc..5f713c02835fcab8a3d566bb13f96e13a4fd7369 100644 (file)
--- a/bin/tests/atomic/t_atomic.c
+++ b/bin/tests/atomic/t_atomic.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_atomic.c,v 1.1 2011/01/11 21:36:22 mgraff Exp $ */
+/* $Id: t_atomic.c,v 1.2 2011/01/11 23:47:12 tbox Exp $ */
 
 #include <config.h>
 
@@ -76,7 +76,7 @@ void
 do_xadd(isc_task_t *task, isc_event_t *ev) {
        counter_t *state = (counter_t *)ev->ev_arg;
        int i;
-       
+
        for (i = 0 ; i < COUNTS_PER_ITERATION ; i++) {
                isc_atomic_xadd(&counter_32, 1);
        }
@@ -100,10 +100,10 @@ test_atomic_xadd() {
                 "ensure that isc_atomic_xadd() works.");
 
        setup();
-       
+
        memset(counters, 0, sizeof(counters));
        counter_32 = 0;
-       
+
        /*
         * Create our tasks, and allocate an event to get the counters going.
         */
@@ -111,7 +111,7 @@ test_atomic_xadd() {
                tasks[i] = NULL;
                CHECK(isc_task_create(task_manager, 0, &tasks[i]));
                event = isc_event_allocate(mctx, NULL, 1000, do_xadd,
-                                          &counters[i], sizeof(struct isc_event));
+                                          &counters[i], sizeof(struct isc_event));
                isc_task_sendanddetach(&tasks[i], &event);
        }
 
@@ -122,7 +122,7 @@ test_atomic_xadd() {
        if (counter_32 != EXPECTED_COUNT_32)
                test_result = T_FAIL;
        t_result(test_result);
-       
+
        counter_32 = 0;
 }
 #endif
@@ -136,7 +136,7 @@ void
 do_xaddq(isc_task_t *task, isc_event_t *ev) {
        counter_t *state = (counter_t *)ev->ev_arg;
        int i;
-       
+
        for (i = 0 ; i < COUNTS_PER_ITERATION ; i++) {
                isc_atomic_xaddq(&counter_64, INCREMENT_64);
        }
@@ -160,10 +160,10 @@ test_atomic_xaddq() {
                 "ensure that isc_atomic_xaddq() works.");
 
        setup();
-       
+
        memset(counters, 0, sizeof(counters));
        counter_64 = 0;
-       
+
        /*
         * Create our tasks, and allocate an event to get the counters going.
         */
@@ -171,7 +171,7 @@ test_atomic_xaddq() {
                tasks[i] = NULL;
                CHECK(isc_task_create(task_manager, 0, &tasks[i]));
                event = isc_event_allocate(mctx, NULL, 1000, do_xaddq,
-                                          &counters[i], sizeof(struct isc_event));
+                                          &counters[i], sizeof(struct isc_event));
                isc_task_sendanddetach(&tasks[i], &event);
        }
 
@@ -183,7 +183,7 @@ test_atomic_xaddq() {
        if (counter_64 != EXPECTED_COUNT_64)
                test_result = T_FAIL;
        t_result(test_result);
-       
+
        counter_64 = 0;
 }
 #endif

diff --git a/bin/tests/system/staticstub/tests.sh b/bin/tests/system/staticstub/tests.sh
index c40e9621909d2adac44e2cb4bf21d7f5a011c0b4..7b2b3fb3f825e2c9ea4f08145fd5f4598cbeaebc 100755 (executable)
--- a/bin/tests/system/staticstub/tests.sh
+++ b/bin/tests/system/staticstub/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2011  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 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.4 2011/01/10 05:08:49 marka Exp $
+# $Id: tests.sh,v 1.5 2011/01/11 23:47:12 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
index b0eb63bacb3695c1c8b5816166472bcba4936016..a417a91b23b2b2b739b88ab42ad4e16a2a6d132f 100644 (file)
--- a/bin/tests/system/tkey/keycreate.c
+++ b/bin/tests/system/tkey/keycreate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 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: keycreate.c,v 1.19 2011/01/10 13:09:49 marka Exp $ */
+/* $Id: keycreate.c,v 1.20 2011/01/11 23:47:13 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
index 2d6ecd0d7e8d68981c73942b72968b35311b7c1a..1bb33e85febf3756c95bb84e3b19c903b1d02bed 100644 (file)
--- a/bin/tests/system/tkey/keydelete.c
+++ b/bin/tests/system/tkey/keydelete.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 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: keydelete.c,v 1.17 2011/01/10 13:09:49 marka Exp $ */
+/* $Id: keydelete.c,v 1.18 2011/01/11 23:47:13 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/configure.in b/configure.in
index 37afe35318e80ae65fd9f0bbd5a0216201579a5d..9035a3d500e9e2d64e5dadcf51bc6839eb9d09af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.510 $)
+AC_REVISION($Revision: 1.511 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)

diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index 2f5c87ff194c4a3ab8e317e38ffe615c680e8dd5..649ccd42badc060432ac4b6515107565c7416ba4 100644 (file)
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -31,7 +31,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: dst_api.c,v 1.56 2011/01/10 05:32:03 marka Exp $
+ * $Id: dst_api.c,v 1.57 2011/01/11 23:47:13 tbox Exp $
  */
 
 /*! \file */
@@ -1201,11 +1201,11 @@ dst_key_restore(dns_name_t *name, unsigned int alg, unsigned int flags,
        isc_result_t result;
        dst_key_t *key;
 
-        REQUIRE(dst_initialized == ISC_TRUE);
-        REQUIRE(keyp != NULL && *keyp == NULL);
+       REQUIRE(dst_initialized == ISC_TRUE);
+       REQUIRE(keyp != NULL && *keyp == NULL);
 
-        if (alg >= DST_MAX_ALGS || dst_t_func[alg] == NULL)
-                return (DST_R_UNSUPPORTEDALG);
+       if (alg >= DST_MAX_ALGS || dst_t_func[alg] == NULL)
+               return (DST_R_UNSUPPORTEDALG);
 
        if (dst_t_func[alg]->restore == NULL)
                return (ISC_R_NOTIMPLEMENTED);

diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
index d2d144742bcbc519559b6b2f579126b638cf1bdf..f2b3e3e5c48c42773a96499181ffde7836a577e2 100644 (file)
--- a/lib/dns/dst_internal.h
+++ b/lib/dns/dst_internal.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_internal.h,v 1.28 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: dst_internal.h,v 1.29 2011/01/11 23:47:13 tbox Exp $ */
 
 #ifndef DST_DST_INTERNAL_H
 #define DST_DST_INTERNAL_H 1

diff --git a/lib/dns/gssapi_link.c b/lib/dns/gssapi_link.c
index e7f5ee320e0fd92fb9320c8ded8b427d5619c443..b368ed095e43d62f87849dcb7fd1f2aded22abc2 100644 (file)
--- a/lib/dns/gssapi_link.c
+++ b/lib/dns/gssapi_link.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: gssapi_link.c,v 1.15 2011/01/10 05:32:03 marka Exp $
+ * $Id: gssapi_link.c,v 1.16 2011/01/11 23:47:13 tbox Exp $
  */
 
 #include <config.h>

diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c
index 996ac18cef185802474f123316b0d7909a5f2182..bc0e9a04ed07dd133df16ccac94a06b045eba0a7 100644 (file)
--- a/lib/dns/hmac_link.c
+++ b/lib/dns/hmac_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -31,7 +31,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: hmac_link.c,v 1.18 2011/01/10 05:32:03 marka Exp $
+ * $Id: hmac_link.c,v 1.19 2011/01/11 23:47:13 tbox Exp $
  */
 
 #include <config.h>

diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index 0d1d03551dea24b7d8cfea3ad23c227d2f9d72e3..9195f20e10cc56aa207e91e41100a1d49628748b 100644 (file)
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-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: result.h,v 1.121 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: result.h,v 1.122 2011/01/11 23:47:13 tbox Exp $ */
 
 #ifndef DNS_RESULT_H
 #define DNS_RESULT_H 1

diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index 1de89dd43ebfd4cd240e3e471f2118931cdad88d..0422414d6edc01c06b71962c0d713f18c586ee57 100644 (file)
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-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: tsig.h,v 1.58 2011/01/10 05:32:04 marka Exp $ */
+/* $Id: tsig.h,v 1.59 2011/01/11 23:47:13 tbox Exp $ */
 
 #ifndef DNS_TSIG_H
 #define DNS_TSIG_H 1

diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 946858702b12b484e4d50b863fa438408d6ad73b..d52e4667856376d4e320304df7f65352048ac04d 100644 (file)
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  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: view.h,v 1.130 2011/01/10 05:32:04 marka Exp $ */
+/* $Id: view.h,v 1.131 2011/01/11 23:47:13 tbox Exp $ */
 
 #ifndef DNS_VIEW_H
 #define DNS_VIEW_H 1

diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h
index c2b4eaddb32efaa08f43d5d7bfcc8d4a67890f8e..0563603678f511e4ebf579ad29b128867ecd5938 100644 (file)
--- a/lib/dns/include/dst/dst.h
+++ b/lib/dns/include/dst/dst.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  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: dst.h,v 1.30 2011/01/10 05:32:04 marka Exp $ */
+/* $Id: dst.h,v 1.31 2011/01/11 23:47:14 tbox Exp $ */
 
 #ifndef DST_DST_H
 #define DST_DST_H 1
@@ -868,8 +868,8 @@ dst_key_dump(dst_key_t *key, isc_mem_t *mctx, char **buffer, int *length);
 
 isc_result_t
 dst_key_restore(dns_name_t *name, unsigned int alg, unsigned int flags,
-                unsigned int protocol, dns_rdataclass_t rdclass,
-                isc_mem_t *mctx, const char *keystr, dst_key_t **keyp);
+               unsigned int protocol, dns_rdataclass_t rdclass,
+               isc_mem_t *mctx, const char *keystr, dst_key_t **keyp);
 
 
 ISC_LANG_ENDDECLS

diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
index 8727e588788f12b5fd2e463fc7c7a9634d6a7671..71b4b1229c7b3747a1fb887758ea348b3737eef1 100644 (file)
--- a/lib/dns/openssldh_link.c
+++ b/lib/dns/openssldh_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -31,7 +31,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssldh_link.c,v 1.19 2011/01/10 05:32:03 marka Exp $
+ * $Id: openssldh_link.c,v 1.20 2011/01/11 23:47:13 tbox Exp $
  */
 
 #ifdef OPENSSL

diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
index 000ac2266f805e5800c5ba306ae88c3df035b974..b623cc80ec2f330a22ec8123fe1d6b5720293952 100644 (file)
--- a/lib/dns/openssldsa_link.c
+++ b/lib/dns/openssldsa_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: openssldsa_link.c,v 1.19 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: openssldsa_link.c,v 1.20 2011/01/11 23:47:13 tbox Exp $ */
 
 #ifdef OPENSSL
 #ifndef USE_EVP

diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index 38f6ad18640f1dd33abd222310f1f1ba0d94ad20..2c3d9ee6afbb39cb04dbe669357c18fa9dd74159 100644 (file)
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.38 2011/01/10 05:32:03 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.39 2011/01/11 23:47:13 tbox Exp $
  */
 #ifdef OPENSSL
 #include <config.h>

diff --git a/lib/dns/result.c b/lib/dns/result.c
index a1c78d96b75c4ba3306ca006c10f4971cb71e06c..547ac14c352c56399f5079886de3545d52e70e99 100644 (file)
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-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: result.c,v 1.131 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: result.c,v 1.132 2011/01/11 23:47:13 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
index 97117cb13e0428ca477eb81421209764f39dfd96..c728e3f945ebe2eca0a68acd46b42de5e072b1e4 100644 (file)
--- a/lib/dns/spnego.c
+++ b/lib/dns/spnego.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006-2011  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: spnego.c,v 1.15 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: spnego.c,v 1.16 2011/01/11 23:47:13 tbox Exp $ */
 
 /*! \file
  * \brief

diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index b3e094418d439fb25fb72ff6c22bf97a8fb5a6be..c9c32c29866af66108efb5a7487ce51f5371529d 100644 (file)
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.146 2011/01/10 07:38:22 marka Exp $
+ * $Id: tsig.c,v 1.147 2011/01/11 23:47:13 tbox Exp $
  */
 /*! \file */
 #include <config.h>
@@ -550,7 +550,7 @@ dst_alg_fromname(dns_name_t *algorithm) {
        } else if (dns_name_equal(algorithm, DNS_TSIG_HMACSHA512_NAME)) {
                return (DST_ALG_HMACSHA512);
        } else if (dns_name_equal(algorithm, DNS_TSIG_GSSAPI_NAME)) {
-               return (DST_ALG_GSSAPI); 
+               return (DST_ALG_GSSAPI);
        } else if (dns_name_equal(algorithm, DNS_TSIG_GSSAPIMS_NAME)) {
                return (DST_ALG_GSSAPI);
        } else
@@ -629,9 +629,9 @@ dump_key(dns_tsigkey_t *tkey, FILE *fp)
 {
        char *buffer = NULL;
        int length = 0;
-        char namestr[DNS_NAME_FORMATSIZE];
-        char creatorstr[DNS_NAME_FORMATSIZE];
-        char algorithmstr[DNS_NAME_FORMATSIZE];
+       char namestr[DNS_NAME_FORMATSIZE];
+       char creatorstr[DNS_NAME_FORMATSIZE];
+       char algorithmstr[DNS_NAME_FORMATSIZE];
        isc_result_t result;
 
        dns_name_format(&tkey->name, namestr, sizeof(namestr));

diff --git a/lib/dns/view.c b/lib/dns/view.c
index 132b8745bca2788f8793fd3b50af80a2b7976c68..7d795c2185e61fa750abe34bd93882eb030dba8e 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  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: view.c,v 1.175 2011/01/10 05:32:03 marka Exp $ */
+/* $Id: view.c,v 1.176 2011/01/11 23:47:13 tbox Exp $ */
 
 /*! \file */
 
@@ -304,7 +304,7 @@ destroy(dns_view_t *view) {
                        if (result == ISC_R_SUCCESS) {
                                if (fclose(fp) == 0)
                                        result = isc_file_rename(template,
-                                                                keyfile);
+                                                                keyfile);
                                if (result != ISC_R_SUCCESS)
                                        (void)remove(template);
                        } else {

diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index 4f5b1db91f09615352cfe4f20510453bb9577391..ec00145cf818c7313ff4acd63f9acea7a2722ed8 100644 (file)
--- a/lib/isc/include/isc/file.h
+++ b/lib/isc/include/isc/file.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2011  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: file.h,v 1.38 2011/01/10 05:32:04 marka Exp $ */
+/* $Id: file.h,v 1.39 2011/01/11 23:47:14 tbox Exp $ */
 
 #ifndef ISC_FILE_H
 #define ISC_FILE_H 1

diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index 4e3d7cd2c16292f0a46773a888530059118fd96f..c8db210ad7add5bf2144221b2b2b647ae26ebf1a 100644 (file)
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: file.c,v 1.56 2011/01/10 05:32:04 marka Exp $ */
+/* $Id: file.c,v 1.57 2011/01/11 23:47:14 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index 22f749a8b54f7857341dc4735f83736a45a96003..4c55052537dba10dd3cf9cf21f17690878a590aa 100644 (file)
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2009, 2011  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: file.c,v 1.36 2011/01/10 05:32:04 marka Exp $ */
+/* $Id: file.c,v 1.37 2011/01/11 23:47:14 tbox Exp $ */
 
 #include <config.h>
 
@@ -345,7 +345,7 @@ isc_file_openuniquemode(char *templet, unsigned int mode, FILE **fp) {
        if (fd == -1)
                result = isc__errno2result(errno);
        if (result == ISC_R_SUCCESS) {
-#if 1 
+#if 1
                UNUSED(mode)
 #else
                (void)fchmod(fd, mode);