update copyright notice

diff --git a/bin/named/config.c b/bin/named/config.c
index cafb78cfac45ee560259a54f31420ba42f0b2538..dc4d928d4f6e24ef2473011486f1f9a2668ccbfd 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2008  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: config.c,v 1.11.2.4.8.36.4.2 2008/07/23 12:03:52 marka Exp $ */
+/* $Id: config.c,v 1.11.2.4.8.36.4.3 2008/07/23 23:47:49 tbox Exp $ */
 
 #include <config.h>
 
@@ -502,7 +502,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
                        tresult = get_masters_def(config, listname, &list);
                        if (tresult == ISC_R_NOTFOUND) {
                                cfg_obj_log(addr, ns_g_lctx, ISC_LOG_ERROR,
-                                    "masters \"%s\" not found", listname);
+                                   "masters \"%s\" not found", listname);
 
                                result = tresult;
                                goto cleanup;
@@ -580,7 +580,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
                if (keys[i] == NULL)
                        goto cleanup;
                dns_name_init(keys[i], NULL);
-               
+
                keystr = cfg_obj_asstring(key);
                isc_buffer_init(&b, keystr, strlen(keystr));
                isc_buffer_add(&b, strlen(keystr));
@@ -636,7 +636,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
                isc_mem_put(mctx, lists, listcount * sizeof(*lists));
        if (stack != NULL)
                isc_mem_put(mctx, stack, stackcount * sizeof(*stack));
-       
+
        INSIST(keycount == addrcount);
 
        *addrsp = addrs;

diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index da7d019f4f56322a0c216b3762af571909ee0e9a..0f5676cfdd6132c185a80ff1fad8c9bd033d28c8 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-2007  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2008  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.1.4.13.4.1 2008/07/23 12:03:52 marka Exp $ -->
+<!-- $Id: named.conf.docbook,v 1.1.4.13.4.2 2008/07/23 23:47:49 tbox Exp $ -->
 
 <refentry>
   <refentryinfo>
@@ -36,6 +36,7 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>

diff --git a/bin/named/server.c b/bin/named/server.c
index f52576369f14b211aaae5648afd8e5a5cd399ad9..afbecb8487efcb8b006ccf9da17cbae82c44caa3 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.339.2.15.2.78.4.2 2008/07/23 12:03:52 marka Exp $ */
+/* $Id: server.c,v 1.339.2.15.2.78.4.3 2008/07/23 23:47:49 tbox Exp $ */
 
 #include <config.h>
 
@@ -2294,12 +2294,12 @@ load_configuration(const char *filename, ns_server_t *server,
                reserved = 128;
        if (reserved + 128U > files) {
                isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
-                              NS_LOGMODULE_SERVER, ISC_LOG_WARNING,
+                             NS_LOGMODULE_SERVER, ISC_LOG_WARNING,
                              "less than 128 UDP sockets available after "
                              "applying 'reserved-sockets' and 'files'");
        }
        isc__socketmgr_setreserved(ns_g_socketmgr, reserved);
-       
+
        /*
         * Configure various server options.
         */

diff --git a/lib/isc/include/isc/resource.h b/lib/isc/include/isc/resource.h
index d3d98a8eb346c087f59da89e6b0626e0c4a168d5..1d4cb3023a4a37feb5440faaa4f6fbc839e9eb6a 100644 (file)
--- a/lib/isc/include/isc/resource.h
+++ b/lib/isc/include/isc/resource.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resource.h,v 1.4.206.1.34.1 2008/07/23 12:03:53 marka Exp $ */
+/* $Id: resource.h,v 1.4.206.1.34.2 2008/07/23 23:47:49 tbox Exp $ */
 
 #ifndef ISC_RESOURCE_H
 #define ISC_RESOURCE_H 1

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 5a9e9da0ac73fa3c9a2f76f95a20fe82857f7411..29ab14d8eb1cc1791a66dca7159cdcdba8a14e70 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.207.2.19.2.35.4.3 2008/07/23 23:16:27 marka Exp $ */
+/* $Id: socket.c,v 1.207.2.19.2.35.4.4 2008/07/23 23:47:49 tbox Exp $ */
 
 #include <config.h>
 
@@ -2967,7 +2967,7 @@ isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region,
 }
 
 isc_result_t
-isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr, 
+isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr,
                unsigned int options) {
        char strbuf[ISC_STRERRORSIZE];
        int on = 1;

diff --git a/lib/isc/win32/resource.c b/lib/isc/win32/resource.c
index 385615cc1252e4fc6f788a95f5460b757d12adaf..136e9b28959a807443a39ce02363f20a9ce67c2c 100644 (file)
--- a/lib/isc/win32/resource.c
+++ b/lib/isc/win32/resource.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 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: resource.c,v 1.2.12.6.4.1 2008/07/23 12:03:53 marka Exp $ */
+/* $Id: resource.c,v 1.2.12.6.4.2 2008/07/23 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 3df1bfe0fb185b99a255beaf345886d70970638a..7c883f413dff2594a5c42cb92072bd1fe9159678 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.5.2.13.2.24.4.4 2008/07/23 23:16:27 marka Exp $ */
+/* $Id: socket.c,v 1.5.2.13.2.24.4.5 2008/07/23 23:47:49 tbox Exp $ */
 
 /* This code has been rewritten to take advantage of Windows Sockets
  * I/O Completion Ports and Events. I/O Completion Ports is ONLY
@@ -3258,7 +3258,7 @@ isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region,
 
 isc_result_t
 isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr,
-               unsigned int options) {
+               unsigned int options) {
        int bind_errno;
        char strbuf[ISC_STRERRORSIZE];
        int on = 1;