update copyright notice

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index bbde762dde45435b4759b593863b6532348627c9..ca3a8468beb4a5c86dc450a934b17f73817aa372 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.137.128.5 2008/06/24 00:09:11 jinmei Exp $ */
+/* $Id: dispatch.c,v 1.137.128.6 2008/06/24 23:46:26 tbox Exp $ */
 
 /*! \file */
 
@@ -2909,8 +2909,8 @@ dns_dispatch_addresponse(dns_dispatch_t *disp, isc_sockaddr_t *dest,
                         isc_task_t *task, isc_taskaction_t action, void *arg,
                         dns_messageid_t *idp, dns_dispentry_t **resp)
 {
-        REQUIRE(VALID_DISPATCH(disp));
-        REQUIRE((disp->attributes & DNS_DISPATCHATTR_EXCLUSIVE) == 0); 
+       REQUIRE(VALID_DISPATCH(disp));
+       REQUIRE((disp->attributes & DNS_DISPATCHATTR_EXCLUSIVE) == 0);
 
        return (dns_dispatch_addresponse2(disp, dest, task, action, arg,
                                          idp, resp, NULL));

diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h
index afd0a5ee2c2c9699040e5b9a933ee91cb1d7f27e..4a52f86d8d62ba08b063a8a5ed148585b01aeafe 100644 (file)
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.h,v 1.56.128.4 2008/06/24 00:09:12 jinmei Exp $ */
+/* $Id: dispatch.h,v 1.56.128.5 2008/06/24 23:46:26 tbox Exp $ */
 
 #ifndef DNS_DISPATCH_H
 #define DNS_DISPATCH_H 1
@@ -120,7 +120,7 @@ struct dns_dispatchevent {
  *     is obsoleted.
  *
  * _EXCLUSIVE
- *     A separate socket will be used on-demand for each transaction. 
+ *     A separate socket will be used on-demand for each transaction.
  */
 #define DNS_DISPATCHATTR_PRIVATE       0x00000001U
 #define DNS_DISPATCHATTR_TCP           0x00000002U
@@ -453,7 +453,7 @@ unsigned int
 dns_dispatch_getattributes(dns_dispatch_t *disp);
 /*%<
  * Return the attributes (DNS_DISPATCHATTR_xxx) of this dispatch.  Only the
- * non-changeable attributes are expected to be referenced by the caller. 
+ * non-changeable attributes are expected to be referenced by the caller.
  *
  * Requires:
  *\li  disp is valid.

diff --git a/lib/dns/request.c b/lib/dns/request.c
index 9cf269c7fb12a488924dc01a748f7f4099668eed..e1709a6a576d36b56d36ba152d1a67a32866ac82 100644 (file)
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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: request.c,v 1.79.128.1 2008/06/24 00:09:11 jinmei Exp $ */
+/* $Id: request.c,v 1.79.128.2 2008/06/24 23:46:26 tbox Exp $ */
 
 /*! \file */
 
@@ -695,7 +695,7 @@ dns_request_createraw3(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf,
        REQUIRE(action != NULL);
        REQUIRE(requestp != NULL && *requestp == NULL);
        REQUIRE(timeout > 0);
-       if (srcaddr != NULL) 
+       if (srcaddr != NULL)
                REQUIRE(isc_sockaddr_pf(srcaddr) == isc_sockaddr_pf(destaddr));
 
        mctx = requestmgr->mctx;
@@ -743,7 +743,7 @@ dns_request_createraw3(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf,
                result = DNS_R_FORMERR;
                goto cleanup;
        }
-               
+
        if ((options & DNS_REQUESTOPT_TCP) != 0 || r.length > 512)
                tcp = ISC_TRUE;
 
@@ -869,7 +869,7 @@ dns_request_createvia2(dns_requestmgr_t *requestmgr, dns_message_t *message,
                                       udpretries, task, action, arg,
                                       requestp));
 }
-                                       
+
 isc_result_t
 dns_request_createvia3(dns_requestmgr_t *requestmgr, dns_message_t *message,
                       isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr,
@@ -895,7 +895,7 @@ dns_request_createvia3(dns_requestmgr_t *requestmgr, dns_message_t *message,
        REQUIRE(action != NULL);
        REQUIRE(requestp != NULL && *requestp == NULL);
        REQUIRE(timeout > 0);
-       if (srcaddr != NULL) 
+       if (srcaddr != NULL)
                REQUIRE(isc_sockaddr_pf(srcaddr) == isc_sockaddr_pf(destaddr));
 
        mctx = requestmgr->mctx;
@@ -1150,7 +1150,7 @@ do_cancel(isc_task_t *task, isc_event_t *event) {
        if (!DNS_REQUEST_CANCELED(request))
                req_cancel(request);
        send_if_done(request, ISC_R_CANCELED);
-       UNLOCK(&request->requestmgr->locks[request->hash]);     
+       UNLOCK(&request->requestmgr->locks[request->hash]);
 }
 
 void

diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index f05084962d080caea6fe7191a84e23faa35b4348..d3e45165cf3c966d7b4ebf7f7c3efd2201398168 100644 (file)
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2008  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.93.58.1 2008/06/24 00:09:12 jinmei Exp $
+# $Id: Makefile.in,v 1.93.58.2 2008/06/24 23:46:26 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/include/isc/portset.h b/lib/isc/include/isc/portset.h
index 818330e66830fc2ec77818e984605cbfac783d3c..89909f92bc23febfad697bf306fbf36916ee98e2 100644 (file)
--- a/lib/isc/include/isc/portset.h
+++ b/lib/isc/include/isc/portset.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: portset.h,v 1.3.2.1 2008/06/24 00:09:12 jinmei Exp $ */
+/* $Id: portset.h,v 1.3.2.2 2008/06/24 23:46:26 tbox Exp $ */
 
 /*! \file isc/portset.h
  * \brief Transport Protocol Port Manipuration Module
@@ -47,7 +47,7 @@ isc_result_t
 isc_portset_create(isc_mem_t *mctx, isc_portset_t **portsetp);
 /*%<
  * Create a port set and initialize it as an empty set.
- * 
+ *
  * Requires:
  *\li  'mctx' to be valid.
  *\li  'portsetp' to be non NULL and '*portsetp' to be NULL;
@@ -61,7 +61,7 @@ void
 isc_portset_destroy(isc_mem_t *mctx, isc_portset_t **portsetp);
 /*%<
  * Destroy a port set.
- * 
+ *
  * Requires:
  *\li  'mctx' to be valid and must be the same context given when the port set
  *       was created.
@@ -72,7 +72,7 @@ isc_boolean_t
 isc_portset_isset(isc_portset_t *portset, in_port_t port);
 /*%<
  * Test whether the given port is stored in the portset.
- * 
+ *
  * Requires:
  *\li  'portset' to be a valid set.
  *
@@ -84,7 +84,7 @@ unsigned int
 isc_portset_nports(isc_portset_t *portset);
 /*%<
  * Provides the number of ports stored in the given portset.
- * 
+ *
  * Requires:
  *\li  'portset' to be a valid set.
  *

diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 58cd1f023632f593967dff7cf8b32e33d30ab47d..348c0732a10f6b3a0f26dc4e6789b1bbc3e33bc4 100644 (file)
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.h,v 1.72.128.3 2008/06/24 00:09:12 jinmei Exp $ */
+/* $Id: socket.h,v 1.72.128.4 2008/06/24 23:46:26 tbox Exp $ */
 
 #ifndef ISC_SOCKET_H
 #define ISC_SOCKET_H 1
@@ -396,7 +396,7 @@ isc_socket_close(isc_socket_t *sock);
  * \li There must be no other reference to this socket.
  *
  * \li There must be no pending I/O requests.
- *             
+ *
  */
 
 isc_result_t

diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h
index 78b9653b4eb16f702f03c9535fe6f06e71cd91c3..03570460d727f5c1ed47c7b065d7e7d3f63c37bd 100644 (file)
--- a/lib/isc/include/isc/timer.h
+++ b/lib/isc/include/isc/timer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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: timer.h,v 1.38.128.1 2008/06/24 00:09:12 jinmei Exp $ */
+/* $Id: timer.h,v 1.38.128.2 2008/06/24 23:46:26 tbox Exp $ */
 
 #ifndef ISC_TIMER_H
 #define ISC_TIMER_H 1

diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index f7417ca1784130ddd3afd52f25631665c62c68f3..390a755e987699fd48f297e95f3c31f06dea1942 100644 (file)
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  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: timer.c,v 1.81.32.1 2008/06/24 00:09:12 jinmei Exp $ */
+/* $Id: timer.c,v 1.81.32.2 2008/06/24 23:46:26 tbox Exp $ */
 
 /*! \file */
 
@@ -225,7 +225,7 @@ schedule(isc_timer_t *timer, isc_time_t *now, isc_boolean_t signal_ok) {
                                      "*** POKED TIMER ***");
                }
        }
-               
+
        if (timer->index == 1 && signal_ok) {
                XTRACE(isc_msgcat_get(isc_msgcat, ISC_MSGSET_TIMER,
                                      ISC_MSG_SIGNALSCHED,

diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index 08b7e217429d439c4f224688bd9230906b41f40e..82d46d33c42aebe195b01bcde7c4191b7c2f3e65 100644 (file)
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  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: net.h,v 1.46.128.1 2008/06/24 00:09:12 jinmei Exp $ */
+/* $Id: net.h,v 1.46.128.2 2008/06/24 23:46:27 tbox Exp $ */
 
 #ifndef ISC_NET_H
 #define ISC_NET_H 1
@@ -104,7 +104,7 @@
 /*%
  * Required for some pre RFC2133 implementations.
  * IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT were added in
- * draft-ietf-ipngwg-bsd-api-04.txt or draft-ietf-ipngwg-bsd-api-05.txt.  
+ * draft-ietf-ipngwg-bsd-api-04.txt or draft-ietf-ipngwg-bsd-api-05.txt.
  * If 's6_addr' is defined then assume that there is a union and three
  * levels otherwise assume two levels required.
  */
@@ -202,7 +202,7 @@ extern const struct in6_addr isc_net_in6addrloop;
 
 #ifdef ISC_PLATFORM_FIXIN6ISADDR
 #undef  IN6_IS_ADDR_GEOGRAPHIC
-/*! 
+/*!
  * \brief
  * Fix UnixWare 7.1.1's broken IN6_IS_ADDR_* definitions.
  */

diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index 1daa2cbbf9a60b9e175fadcb96e9e8287572bfa8..c2d8ba7068becabc6de789f5a770daa378e97836 100644 (file)
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  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: net.c,v 1.36.60.2 2008/06/24 01:43:40 jinmei Exp $ */
+/* $Id: net.c,v 1.36.60.3 2008/06/24 23:46:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 9b04c5a65eba98303418276cb037e92b26f8d20a..9d790fcf916f50c9ac4d853463a85280c3fef355 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.275.10.6 2008/06/24 01:58:41 jinmei Exp $ */
+/* $Id: socket.c,v 1.275.10.7 2008/06/24 23:46:26 tbox Exp $ */
 
 /*! \file */
 
@@ -80,7 +80,7 @@
 #endif
 
 /*%
- * Choose the most preferable multiplex method. 
+ * Choose the most preferable multiplex method.
  */
 #ifdef ISC_PLATFORM_HAVEKQUEUE
 #define USE_KQUEUE
@@ -563,7 +563,7 @@ unwatch_fd(isc_socketmgr_t *manager, int fd, int msg) {
                writelen += sizeof(pfds[1]);
        }
 
-       if (write(manager->devpoll_fd, pfds, writelen) == -1) 
+       if (write(manager->devpoll_fd, pfds, writelen) == -1)
                result = isc__errno2result(errno);
        else {
                if (msg == SELECT_POKE_READ)
@@ -3192,7 +3192,7 @@ setup_watcher(isc_mem_t *mctx, isc_socketmgr_t *manager) {
                            sizeof(struct kevent) * manager->nevents);
                return (result);
        }
-       
+
 #ifdef ISC_PLATFORM_USETHREADS
        result = watch_fd(manager, manager->pipe_fds[0], SELECT_POKE_READ);
        if (result != ISC_R_SUCCESS) {

diff --git a/lib/isc/unix/socket_p.h b/lib/isc/unix/socket_p.h
index c7753493e159923d64c0eb631db69a08c1a363e9..1a34c9e042bff1af68824bf9896725a80bd8f5de 100644 (file)
--- a/lib/isc/unix/socket_p.h
+++ b/lib/isc/unix/socket_p.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  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: socket_p.h,v 1.11.128.1 2008/06/24 00:09:12 jinmei Exp $ */
+/* $Id: socket_p.h,v 1.11.128.2 2008/06/24 23:46:27 tbox Exp $ */
 
 #ifndef ISC_SOCKET_P_H
 #define ISC_SOCKET_P_H

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index c679caf258bfd3b95b5157200ea83d7765c5898a..a7994b3fe971a03b7e8f4a6d0cc67362dbda3f62 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namedconf.c,v 1.78.46.8 2008/06/24 00:09:12 jinmei Exp $ */
+/* $Id: namedconf.c,v 1.78.46.9 2008/06/24 23:46:27 tbox Exp $ */
 
 /*! \file */
 
@@ -566,7 +566,7 @@ parse_port(cfg_parser_t *pctx, cfg_obj_t **ret) {
                cfg_obj_destroy(pctx, ret);
                result = ISC_R_RANGE;
        }
-       
+
  cleanup:
        return (result);
 }