update copyright notice

diff --git a/lib/isc/include/isc/msgs.h b/lib/isc/include/isc/msgs.h
index e2e46e1c8d50afea5acaffb35411566d310ac857..0970647dafcd410089a304e6b5dd2c5954f1f470 100644 (file)
--- a/lib/isc/include/isc/msgs.h
+++ b/lib/isc/include/isc/msgs.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  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: msgs.h,v 1.9.18.3 2008/08/08 05:15:08 marka Exp $ */
+/* $Id: msgs.h,v 1.9.18.4 2008/08/08 06:27:56 tbox Exp $ */
 
 #ifndef ISC_MSGS_H
 #define ISC_MSGS_H 1
@@ -57,7 +57,7 @@
 
 /*@{*/
 /*!
- * Message numbers  
+ * Message numbers
  * are only required to be unique per message set,
  * but are unique throughout the entire catalog to not be as confusing when
  * debugging.

diff --git a/lib/isc/win32/errno2result.c b/lib/isc/win32/errno2result.c
index 468d9e7933f013ac0007968d7755e685111e8a9e..c24a8ab33e6af3520862ce2c7f5ccecced1e870a 100644 (file)
--- a/lib/isc/win32/errno2result.c
+++ b/lib/isc/win32/errno2result.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  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: errno2result.c,v 1.9.18.4 2008/08/08 05:15:09 marka Exp $ */
+/* $Id: errno2result.c,v 1.9.18.5 2008/08/08 06:27:56 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 23f170c5c920d8a53b3e35822de5e6ea407acf06..78df65d53ccbb1a7d80284049f953cb94a426867 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.30.18.30 2008/08/08 05:15:09 marka Exp $ */
+/* $Id: socket.c,v 1.30.18.31 2008/08/08 06:27:56 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
@@ -567,9 +567,9 @@ socket_event_minit(sock_event_list *evlist) {
                                ISC_LOGCATEGORY_GENERAL,
                                ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR,
                                isc_msgcat, ISC_MSGSET_SOCKET,
-                               ISC_MSG_TOOMANYHANDLES,
+                               ISC_MSG_TOOMANYHANDLES,
                                "%s: too many open WSA event handles: %s",
-                               "WSACreateEvent", strbuf);
+                               "WSACreateEvent", strbuf);
                return (ISC_R_UNEXPECTED);
        }
 
@@ -900,9 +900,9 @@ socket_event_add(isc_socket_t *sock, long type) {
                                ISC_LOGCATEGORY_GENERAL,
                                ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR,
                                isc_msgcat, ISC_MSGSET_SOCKET,
-                               ISC_MSG_TOOMANYHANDLES,
+                               ISC_MSG_TOOMANYHANDLES,
                                "%s: too many open WSA event handles: %s",
-                               "WSACreateEvent", strbuf);
+                               "WSACreateEvent", strbuf);
                return (ISC_R_UNEXPECTED);
        }
        if (WSAEventSelect(sock->fd, hEvent, type) != 0) {
@@ -2273,15 +2273,15 @@ internal_accept(isc_socket_t *sock, int accept_errno) {
                                        ISC_LOGCATEGORY_GENERAL,
                                        ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR,
                                        isc_msgcat, ISC_MSGSET_SOCKET,
-                                       ISC_MSG_TOOMANYFDS,
-                                       "%s: too many open file descriptors",
-                                       "accept");
+                                       ISC_MSG_TOOMANYFDS,
+                                       "%s: too many open file descriptors",
+                                       "accept");
                                goto soft_error;
                        } else if (SOFT_ERROR(accept_errno) ||
                                   accept_errno == WSAECONNRESET) {
                                goto soft_error;
                        } else {
-                               isc__strerror(accept_errno, strbuf, 
+                               isc__strerror(accept_errno, strbuf,
                                              sizeof(strbuf));
                                UNEXPECTED_ERROR(__FILE__, __LINE__,
                                         "internal_accept: accept() %s: %s",