update copyright notice

diff --git a/bin/named/builtin.c b/bin/named/builtin.c
index 5702a2b47f8e850305fe04a01ab7fa46724d9e67..dffeed684fca6b0ca80a2794bd799d54c18b70eb 100644 (file)
--- a/bin/named/builtin.c
+++ b/bin/named/builtin.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-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: builtin.c,v 1.19 2011/01/07 21:42:03 each Exp $ */
+/* $Id: builtin.c,v 1.20 2011/01/07 23:47:07 tbox Exp $ */
 
 /*! \file
  * \brief
@@ -139,7 +139,7 @@ dns64_cname(const char *zone, const char *name, dns_sdblookup_t *lookup) {
        }
 
        /*
-        * If we get here then we know name only consisted of nibbles.
+        * If we get here then we know name only consisted of nibbles.
         * Now we need to determine if the name exists or not and whether
         * it corresponds to a empty node in the zone or there should be
         * a CNAME.
@@ -224,7 +224,7 @@ dns64_cname(const char *zone, const char *name, dns_sdblookup_t *lookup) {
                 * If the total length is not 71 then this is a empty node
                 * so return success.
                 */
-               if (nlen + zlen != 71U) 
+               if (nlen + zlen != 71U)
                        return (ISC_R_SUCCESS);
                snprintf(reverse, sizeof(reverse), "%u.%u.%u.%u.in-addr.arpa.",
                         v[0], v[1], v[2], v[3]);

diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index 3f3c2a599f663f6546aef1e90ed97ad651380caf..74d83c4623c40e77d13ee792946e1a0be253b84d 100644 (file)
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
               [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-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
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named.conf.docbook,v 1.48 2011/01/07 04:31:38 marka Exp $ -->
+<!-- $Id: named.conf.docbook,v 1.49 2011/01/07 23:47:07 tbox Exp $ -->
 <refentry>
   <refentryinfo>
     <date>Aug 13, 2004</date>
@@ -43,6 +43,7 @@
       <year>2008</year>
       <year>2009</year>
       <year>2010</year>
+      <year>2011</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>

diff --git a/bin/tests/system/dns64/ns2/named.conf b/bin/tests/system/dns64/ns2/named.conf
index ae5a575974354606138d46995d2f0eaf82f5d068..df6fb9273b1faadd8fdddb7fe0235e7455aac783 100644 (file)
--- a/bin/tests/system/dns64/ns2/named.conf
+++ b/bin/tests/system/dns64/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * 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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.3 2011/01/07 04:31:38 marka Exp $ */
+/* $Id: named.conf,v 1.4 2011/01/07 23:47:07 tbox Exp $ */
 
 // NS2
 

diff --git a/bin/tests/system/dns64/tests.sh b/bin/tests/system/dns64/tests.sh
index fde9582b7807d4c058dfac9a57e67565d672b9ae..9f0608b9156fe42909c1e28aaa58858850c42f6f 100644 (file)
--- a/bin/tests/system/dns64/tests.sh
+++ b/bin/tests/system/dns64/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.3 2011/01/07 04:31:38 marka Exp $
+# $Id: tests.sh,v 1.4 2011/01/07 23:47:07 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/tsiggss/authsock.pl b/bin/tests/system/tsiggss/authsock.pl
index 976f7e6173ae514ed7f5deb7e8993f4528ab3c1f..338281158b397f290843abe3384d998d579d3230 100644 (file)
--- a/bin/tests/system/tsiggss/authsock.pl
+++ b/bin/tests/system/tsiggss/authsock.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2010  Andrew Tridgell
+# Copyright (C) 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,6 +14,8 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
+# $Id: authsock.pl,v 1.3 2011/01/07 23:47:07 tbox Exp $
+
 # test the update-policy external protocol
 
 require 5.6.0;

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 2a776f4d79f35da38f03263e58470ba27d6ebbb8..7e7de7ef107183a1e3a21a6fee1aa693d2aab847 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.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) 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: check.c,v 1.124 2011/01/07 04:31:39 marka Exp $ */
+/* $Id: check.c,v 1.125 2011/01/07 23:47:07 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/ssu_external.c b/lib/dns/ssu_external.c
index fe1fa0dec975134a5076a5a89ebcf4c41d271c11..3a5141fb4efced266f97a86a841e3261e6954e8b 100644 (file)
--- a/lib/dns/ssu_external.c
+++ b/lib/dns/ssu_external.c
@@ -1,20 +1,21 @@
 /*
  * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
- * Written by Andrew Tridgell
  *
  * 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.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ * 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 THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * 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: ssu_external.c,v 1.4 2011/01/07 23:47:07 tbox Exp $ */
+
 /*
  * This implements external update-policy rules.  This allows permission
  * to update a zone to be checked by consulting an external daemon (e.g.,
@@ -64,7 +65,7 @@ static int
 ux_socket_connect(const char *path) {
        int fd = -1;
 #ifdef ISC_PLATFORM_HAVESYSUNH
-        struct sockaddr_un addr;
+       struct sockaddr_un addr;
 
        REQUIRE(path != NULL);
 
@@ -75,9 +76,9 @@ ux_socket_connect(const char *path) {
                return (-1);
        }
 
-        memset(&addr, 0, sizeof(addr));
-        addr.sun_family = AF_UNIX;
-        strncpy(addr.sun_path, path, sizeof(addr.sun_path));
+       memset(&addr, 0, sizeof(addr));
+       addr.sun_family = AF_UNIX;
+       strncpy(addr.sun_path, path, sizeof(addr.sun_path));
 
        fd = socket(AF_UNIX, SOCK_STREAM, 0);
        if (fd == -1) {
@@ -92,7 +93,7 @@ ux_socket_connect(const char *path) {
                char strbuf[ISC_STRERRORSIZE];
                isc__strerror(errno, strbuf, sizeof(strbuf));
                ssu_e_log(3, "ssu_external: unable to connect to "
-                            "socket '%s' - %s",
+                            "socket '%s' - %s",
                          path, strbuf);
                close(fd);
                return (-1);
@@ -171,7 +172,7 @@ dns_ssu_external_match(dns_name_t *identity,
        if (key)
                dst_key_format(key, b_key, sizeof(b_key));
        else
-               b_key[0] = 0;           
+               b_key[0] = 0;
 
        if (tkey_token) {
                isc_buffer_region(tkey_token, &token_region);