update copyright notice

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 6034f050da22ef7ab6964cbcf2ba32a48326c84f..3019aa045d7e977207c2c72687ae39fcb03966d6 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.116.18.22 2008/06/24 02:02:50 jinmei Exp $ */
+/* $Id: dispatch.c,v 1.116.18.23 2008/06/24 23:45:55 tbox Exp $ */
 
 /*! \file */
 
@@ -2890,8 +2890,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 5b20379697fa19998de5cfc79a35656960a59975..8c143207b9ea9fadfd01dd97d3193c527ccb1c78 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.48.18.8 2008/06/24 02:02:50 jinmei Exp $ */
+/* $Id: dispatch.h,v 1.48.18.9 2008/06/24 23:45:55 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
@@ -438,7 +438,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 e8ff97c89e17c8c3a7bda193754044365261c33e..ca25e268ff7fb911e49ae96241ca5b9b8fc6f0bd 100644 (file)
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006, 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: request.c,v 1.72.18.6 2008/06/24 02:02:50 jinmei Exp $ */
+/* $Id: request.c,v 1.72.18.7 2008/06/24 23:45:55 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 e49c49ef090089b370ac7fcc5062e5703948ca4a..82afe5fc6b97e1cada738d9afeebd2c57daaadf2 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.81.18.9 2008/06/24 02:02:51 jinmei Exp $
+# $Id: Makefile.in,v 1.81.18.10 2008/06/24 23:45:55 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index c3502ea79a46e852fe720bb884ff79cf4e5989ab..afcd4df01ccbb266bde496c0aedd8f7f29794361 100644 (file)
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -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: platform.h.in,v 1.34.18.10 2008/06/24 02:02:51 jinmei Exp $ */
+/* $Id: platform.h.in,v 1.34.18.11 2008/06/24 23:45:55 tbox Exp $ */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1
@@ -239,19 +239,19 @@
 
 /*
  * If the "xadd" operation is available on this architecture,
- * ISC_PLATFORM_HAVEXADD will be defined. 
+ * ISC_PLATFORM_HAVEXADD will be defined.
  */
 @ISC_PLATFORM_HAVEXADD@
 
 /*
  * If the "atomic swap" operation is available on this architecture,
- * ISC_PLATFORM_HAVEATOMICSTORE" will be defined. 
+ * ISC_PLATFORM_HAVEATOMICSTORE" will be defined.
  */
 @ISC_PLATFORM_HAVEATOMICSTORE@
 
 /*
  * If the "compare-and-exchange" operation is available on this architecture,
- * ISC_PLATFORM_HAVECMPXCHG will be defined. 
+ * ISC_PLATFORM_HAVECMPXCHG will be defined.
  */
 @ISC_PLATFORM_HAVECMPXCHG@
 

diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 93dfbe05ad592bf1d6c33572c2b651514080cd60..682f5d227583638dd57abfeb1c2786a22c177ddb 100644 (file)
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-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: socket.h,v 1.57.18.7 2008/06/24 02:02:51 jinmei Exp $ */
+/* $Id: socket.h,v 1.57.18.8 2008/06/24 23:45:55 tbox Exp $ */
 
 #ifndef ISC_SOCKET_H
 #define ISC_SOCKET_H 1
@@ -347,7 +347,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
@@ -770,7 +770,7 @@ isc_socket_cleanunix(isc_sockaddr_t *addr, isc_boolean_t active);
 
 isc_result_t
 isc_socket_permunix(isc_sockaddr_t *sockaddr, isc_uint32_t perm,
-                    isc_uint32_t owner, isc_uint32_t group);
+                   isc_uint32_t owner, isc_uint32_t group);
 /*%<
  * Set ownership and file permissions on the UNIX domain socket.
  *

diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h
index 515ee0b5e5711ad2d16c9e5e44685996c53bf005..7a7f614cb6ce3dab5756fef232084c1b9917f46c 100644 (file)
--- a/lib/isc/include/isc/timer.h
+++ b/lib/isc/include/isc/timer.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) 1998-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: timer.h,v 1.31.18.4 2008/06/24 02:02:51 jinmei Exp $ */
+/* $Id: timer.h,v 1.31.18.5 2008/06/24 23:45:55 tbox Exp $ */
 
 #ifndef ISC_TIMER_H
 #define ISC_TIMER_H 1

diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index 1b48146b4c109923428189c5d8b5b03e4c24f1b1..b501b2cdcf241a56aa9b2329867aa4764ac38d3c 100644 (file)
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.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) 1999-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: types.h,v 1.35.18.3 2008/06/24 02:02:51 jinmei Exp $ */
+/* $Id: types.h,v 1.35.18.4 2008/06/24 23:45:55 tbox Exp $ */
 
 #ifndef ISC_TYPES_H
 #define ISC_TYPES_H 1

diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 0bb27fcbd06879f8d04db24f4fe9c44df12350e0..80aae5f8763d244f1f925282c212d8289789ab31 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.73.18.8 2008/06/24 02:02:51 jinmei Exp $ */
+/* $Id: timer.c,v 1.73.18.9 2008/06/24 23:45:55 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 dffc8590dbf8ddbeb8c386cfbad0ffac710d91dd..948e7b19d3d4cc206a4db5c4f9774db02442bc24 100644 (file)
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.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) 1999-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: net.h,v 1.39.18.5 2008/06/24 02:02:51 jinmei Exp $ */
+/* $Id: net.h,v 1.39.18.6 2008/06/24 23:45:55 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 aa369ac35aa4306740132664f10a8d9723864b6d..3cc491427247841836536f0e68bc045dbb1c1f3f 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.29.18.7 2008/06/24 02:02:51 jinmei Exp $ */
+/* $Id: net.c,v 1.29.18.8 2008/06/24 23:45:55 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 6f1858c36da77972e62c66c9796f2bf8742f6612..d9cd6ef52578f7cb27e1c8d4baab216778d77f5d 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.237.18.34 2008/06/24 02:02:51 jinmei Exp $ */
+/* $Id: socket.c,v 1.237.18.35 2008/06/24 23:45:55 tbox Exp $ */
 
 /*! \file */
 
@@ -75,7 +75,7 @@
 #endif /* ISC_PLATFORM_USETHREADS */
 
 /*%
- * Choose the most preferable multiplex method. 
+ * Choose the most preferable multiplex method.
  */
 #ifdef ISC_PLATFORM_HAVEKQUEUE
 #define USE_KQUEUE
@@ -553,7 +553,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)
@@ -3008,7 +3008,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 bf5632584b2edfadae6eb21cd0be528097f80cab..b7da860d20d4137982db99084219bdc952ed3dbc 100644 (file)
--- a/lib/isc/unix/socket_p.h
+++ b/lib/isc/unix/socket_p.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, 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: socket_p.h,v 1.7.18.3 2008/06/24 02:02:51 jinmei Exp $ */
+/* $Id: socket_p.h,v 1.7.18.4 2008/06/24 23:45:55 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 4a1f119e1b28e013edeb8ff20a02b90e25088d7c..f813387efcf71ab7c097d84af8de20347615513c 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.30.18.41 2008/06/24 02:02:51 jinmei Exp $ */
+/* $Id: namedconf.c,v 1.30.18.42 2008/06/24 23:45:56 tbox Exp $ */
 
 /*! \file */
 
@@ -564,7 +564,7 @@ parse_port(cfg_parser_t *pctx, cfg_obj_t **ret) {
                cfg_obj_destroy(pctx, ret);
                result = ISC_R_RANGE;
        }
-       
+
  cleanup:
        return (result);
 }