update copyright notice

diff --git a/bin/named/client.c b/bin/named/client.c
index 4202e267076462745d92d5df029ef86247381507..602b8bc9eb2bd716d8c37f1518a30424c75f0b5c 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.275 2011/07/28 04:27:26 marka Exp $ */
+/* $Id: client.c,v 1.276 2011/07/28 23:47:58 tbox Exp $ */
 
 #include <config.h>
 
@@ -2568,7 +2568,7 @@ ns_clientmgr_createclients(ns_clientmgr_t *manager, unsigned int n,
                        if (client != NULL) {
                                MTRACE("recycle");
                                ISC_LIST_UNLINK(manager->inactive, client,
-                                               link);
+                                               link);
                                client->list = NULL;
                        } else {
                                MTRACE("create new");

diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h
index 2821984cc881ed6cf3c7ecf23002f8a245a84081..380dbedd76868d8bfb5533f34a5f99a5c76bef0b 100644 (file)
--- a/bin/named/include/named/interfacemgr.h
+++ b/bin/named/include/named/interfacemgr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 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: interfacemgr.h,v 1.34 2011/07/28 04:04:36 each Exp $ */
+/* $Id: interfacemgr.h,v 1.35 2011/07/28 23:47:58 tbox Exp $ */
 
 #ifndef NAMED_INTERFACEMGR_H
 #define NAMED_INTERFACEMGR_H 1
@@ -66,7 +66,7 @@
 
 #define NS_INTERFACEFLAG_ANYADDR       0x01U   /*%< bound to "any" address */
 #define MAX_UDP_DISPATCH 128           /*%< Maximum number of UDP dispatchers
-                                                     to start per interface */
+                                                    to start per interface */
 /*% The nameserver interface structure */
 struct ns_interface {
        unsigned int            magic;          /*%< Magic number. */

diff --git a/bin/tests/system/filter-aaaa/Makefile.in b/bin/tests/system/filter-aaaa/Makefile.in
index 63524658e868348c32b39bec00c9ff6d757b0e8e..28fe8ca3993eb66e223774ce2210e6854886f7b4 100644 (file)
--- a/bin/tests/system/filter-aaaa/Makefile.in
+++ b/bin/tests/system/filter-aaaa/Makefile.in
@@ -1,4 +1,4 @@
-# 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
@@ -12,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.3 2011/07/28 03:20:45 marka Exp $
+# $Id: Makefile.in,v 1.4 2011/07/28 23:47:58 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/system/filter-aaaa/filter-aaaa.c b/bin/tests/system/filter-aaaa/filter-aaaa.c
index 57f9bf87f0f56f6e9cbce623c0757e6dae9a8fc2..64428d2c16de91c9e9f02bcb000c39af5ff5446e 100644 (file)
--- a/bin/tests/system/filter-aaaa/filter-aaaa.c
+++ b/bin/tests/system/filter-aaaa/filter-aaaa.c
@@ -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: filter-aaaa.c,v 1.3 2011/07/27 23:38:21 marka Exp $ */
+/* $Id: filter-aaaa.c,v 1.4 2011/07/28 23:47:58 tbox Exp $ */
 
 #include <config.h>
 #include <isc/util.h>

diff --git a/isc-config.sh.html b/isc-config.sh.html
index 131dcaaa939790ad2bbf2bd5d1f932e26878e334..761e0e43a3c2482d1ded198a1755dc24a7c79680 100644 (file)
--- a/isc-config.sh.html
+++ b/isc-config.sh.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2009, 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: isc-config.sh.html,v 1.3 2011/07/28 13:33:09 tbox Exp $ -->
+<!-- $Id: isc-config.sh.html,v 1.4 2011/07/28 23:47:57 tbox Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index ba3eefe013b82bde959d8fa20a0f75dc79bd785c..ab049fa3c1975add63ab77bac56c3d876227327b 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.173 2011/07/28 04:04:36 each Exp $ */
+/* $Id: dispatch.c,v 1.174 2011/07/28 23:47:58 tbox Exp $ */
 
 /*! \file */
 
@@ -906,7 +906,7 @@ get_dispsocket(dns_dispatch_t *disp, isc_sockaddr_t *dest,
                if (portentry != NULL)
                        bindoptions |= ISC_SOCKET_REUSEADDRESS;
                result = open_socket(sockmgr, &localaddr, bindoptions, &sock,
-                                    NULL);
+                                    NULL);
                if (result == ISC_R_SUCCESS) {
                        if (portentry == NULL) {
                                portentry = new_portentry(disp, port);
@@ -2707,7 +2707,7 @@ dns_dispatch_getudp_dup(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr,
                                disp->attributes |= DNS_DISPATCHATTR_NOLISTEN;
                                if (disp->recv_pending != 0)
                                        isc_socket_cancel(disp->socket,
-                                                         disp->task[0],
+                                                         disp->task[0],
                                                          ISC_SOCKCANCEL_RECV);
                        }
 

diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h
index b0c59e54ba8f3a84a21d56c5dc4aff18d9e9720c..643887c608288bfdd733ad406c9e4fa0fde7f3ea 100644 (file)
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -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) 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: dispatch.h,v 1.63 2011/07/28 04:04:37 each Exp $ */
+/* $Id: dispatch.h,v 1.64 2011/07/28 23:47:58 tbox Exp $ */
 
 #ifndef DNS_DISPATCH_H
 #define DNS_DISPATCH_H 1

diff --git a/lib/isc/include/isc/namespace.h b/lib/isc/include/isc/namespace.h
index 427e332a183c0b898f8b5343bfa0505b6e48e674..0f93ddd60e5d794bfdafd228b2f690a326e26497 100644 (file)
--- a/lib/isc/include/isc/namespace.h
+++ b/lib/isc/include/isc/namespace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009-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: namespace.h,v 1.10 2011/07/28 04:04:37 each Exp $ */
+/* $Id: namespace.h,v 1.11 2011/07/28 23:47:59 tbox Exp $ */
 
 #ifndef ISCAPI_NAMESPACE_H
 #define ISCAPI_NAMESPACE_H 1

diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 8bf5e6b2b4a0780212b2ad755f8fdb90b77e8efa..036025c0eee110600e530c5195d3c8bd07585b3b 100644 (file)
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -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) 1998-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: socket.h,v 1.96 2011/07/28 11:42:41 marka Exp $ */
+/* $Id: socket.h,v 1.97 2011/07/28 23:47:59 tbox Exp $ */
 
 #ifndef ISC_SOCKET_H
 #define ISC_SOCKET_H 1

diff --git a/lib/isc/socket_api.c b/lib/isc/socket_api.c
index a8fa86d4446f4a55c8c74f7402c3b77905787159..bbf371b1df74719993fedad717822499bb3e561c 100644 (file)
--- a/lib/isc/socket_api.c
+++ b/lib/isc/socket_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 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: socket_api.c,v 1.6 2011/07/28 11:42:41 marka Exp $ */
+/* $Id: socket_api.c,v 1.7 2011/07/28 23:47:59 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/tests/socket_test.c b/lib/isc/tests/socket_test.c
index 3aaaf043e51160e077c2c4c54894e35f41b51ff4..b7bdcfbf2a184d2936de6d517eb1f8d0dfecb25d 100644 (file)
--- a/lib/isc/tests/socket_test.c
+++ b/lib/isc/tests/socket_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket_test.c,v 1.2 2011/07/28 04:04:37 each Exp $ */
+/* $Id: socket_test.c,v 1.3 2011/07/28 23:47:59 tbox Exp $ */
 
 /*! \file */
 
@@ -128,7 +128,7 @@ ATF_TC_BODY(udp_sendto, tc) {
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
        result = isc_socket_bind(s2, &addr2, ISC_SOCKET_REUSEADDRESS);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-       
+
        result = isc_task_create(taskmgr, 0, &task);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
@@ -204,7 +204,7 @@ ATF_TC_BODY(udp_dup, tc) {
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
        result = isc_socket_bind(s3, &addr2, ISC_SOCKET_REUSEADDRESS);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
-       
+
        result = isc_task_create(taskmgr, 0, &task);
        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 06522e1e2d8955a019a994aeeba1d7df306997e2..458387fe1444b6bafd959c1ebbf2d1873f761b78 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.343 2011/07/28 11:42:41 marka Exp $ */
+/* $Id: socket.c,v 1.344 2011/07/28 23:47:59 tbox Exp $ */
 
 /*! \file */
 
@@ -2642,8 +2642,8 @@ isc__socket_dup(isc_socket_t *sock0, isc_socket_t **socketp) {
        REQUIRE(socketp != NULL && *socketp == NULL);
 
        return (socket_create((isc_socketmgr_t *) sock->manager,
-                              sock->pf, sock->type, socketp,
-                              sock0));
+                             sock->pf, sock->type, socketp,
+                             sock0));
 }
 
 #ifdef BIND9

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 1c5935878cf5e10df6606cdc614ca50a3636bdbc..9367b3ce16ce9c08e07e82e9083d9be5b1e45522 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.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) 2000-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: socket.c,v 1.89 2011/07/28 04:27:27 marka Exp $ */
+/* $Id: socket.c,v 1.90 2011/07/28 23:47:59 tbox Exp $ */
 
 /* This code uses functions which are only available on Server 2003 and
  * higher, and Windows XP and higher.