update copyright notice

diff --git a/acconfig.h b/acconfig.h
index 8d8f18b4817e4eb21a17afa2b926a5b48c12e4a0..ab8b5e9fe4507ae4c111f154c199f5b264b13c6f 100644 (file)
--- a/acconfig.h
+++ b/acconfig.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: acconfig.h,v 1.44.18.6 2008/12/01 04:02:15 marka Exp $ */
+/* $Id: acconfig.h,v 1.44.18.7 2008/12/01 23:45:56 tbox Exp $ */
 
 /*! \file */
 
@@ -109,7 +109,7 @@ int sigwait(const unsigned int *set, int *sig);
  * The silly continuation line is to keep configure from
  * commenting out the #undef.
  */
- 
+
 #undef \
        va_start
 #define        va_start(ap, last) \

diff --git a/lib/isc/inet_aton.c b/lib/isc/inet_aton.c
index 96176db6eeece28644671ca38609ce94ce651317..c47fa3c4fe772380191e7cd2e5a3255c38036817 100644 (file)
--- a/lib/isc/inet_aton.c
+++ b/lib/isc/inet_aton.c
@@ -1,8 +1,8 @@
 /*
- * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1996-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.
  *
@@ -71,7 +71,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)inet_addr.c        8.1 (Berkeley) 6/17/93";
-static char rcsid[] = "$Id: inet_aton.c,v 1.17.18.3 2008/12/01 13:29:37 marka Exp $";
+static char rcsid[] = "$Id: inet_aton.c,v 1.17.18.4 2008/12/01 23:45:57 tbox Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>

diff --git a/lib/isc/unix/dir.c b/lib/isc/unix/dir.c
index 836825370437bca89dec978035d5f6c6894d2178..d4ef88153ea1079bc1b3af2854b99b08fa500c19 100644 (file)
--- a/lib/isc/unix/dir.c
+++ b/lib/isc/unix/dir.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) 1999-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: dir.c,v 1.20.18.4 2008/12/01 04:02:15 marka Exp $ */
+/* $Id: dir.c,v 1.20.18.5 2008/12/01 23:45:57 tbox Exp $ */
 
 /*! \file
  * \author  Principal Authors: DCL */
@@ -93,7 +93,7 @@ isc_dir_open(isc_dir_t *dir, const char *dirname) {
 }
 
 /*!
- * \brief Return previously retrieved file or get next one.  
+ * \brief Return previously retrieved file or get next one.
 
  * Unix's dirent has
  * separate open and read functions, but the Win32 and DOS interfaces open

diff --git a/lib/isc/unix/entropy.c b/lib/isc/unix/entropy.c
index e8a970d1fc2b2acfb4873685c435caeb17abb131..0192ac1e26116cfd9b0dcbece6eb3affd95aa195 100644 (file)
--- a/lib/isc/unix/entropy.c
+++ b/lib/isc/unix/entropy.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-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: entropy.c,v 1.71.18.8 2008/12/01 04:02:15 marka Exp $ */
+/* $Id: entropy.c,v 1.71.18.9 2008/12/01 23:45:57 tbox Exp $ */
 
 /* \file unix/entropy.c
  * \brief
@@ -156,12 +156,12 @@ get_from_usocketsource(isc_entropysource_t *source, isc_uint32_t desired) {
                                source->sources.usocket.status =
                                        isc_usocketsource_ndesired;
                                goto eagain_loop;
-                       }       
+                       }
                        INSIST(n == 2);
                        source->sources.usocket.status =
                                                isc_usocketsource_wrote;
                        /*FALLTHROUGH*/
-               
+
                case isc_usocketsource_wrote:
                        if (recvfrom(fd, buf, 1, 0, NULL, NULL) != 1) {
                                if (errno == EAGAIN) {
@@ -169,11 +169,11 @@ get_from_usocketsource(isc_entropysource_t *source, isc_uint32_t desired) {
                                         * The problem of EAGAIN (try again
                                         * later) is a major issue on HP-UX.
                                         * Solaris actually tries the recvfrom
-                                        * call again, while HP-UX just dies. 
+                                        * call again, while HP-UX just dies.
                                         * This code is an attempt to let the
                                         * entropy pool fill back up (at least
                                         * that's what I think the problem is.)
-                                        * We go to eagain_loop because if we 
+                                        * We go to eagain_loop because if we
                                         * just "break", then the "desired"
                                         * amount gets borked.
                                         */
@@ -212,7 +212,7 @@ get_from_usocketsource(isc_entropysource_t *source, isc_uint32_t desired) {
                        } else
                                n = 0;
                        break;
-               
+
                default:
                        goto err;
                }
@@ -502,7 +502,7 @@ isc_entropy_createfilesource(isc_entropy_t *ent, const char *fname) {
                ret = isc__errno2result(errno);
                goto errout;
        }
-       /* 
+       /*
         * Solaris 2.5.1 does not have support for sockets (S_IFSOCK),
         * but it does return type S_IFIFO (the OS believes that
         * the socket is a fifo).  This may be an issue if we tell

diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index 628177f3e9ef12e90d806391fe732310b62d665a..ffa3a493920d9dbd83d00be1e4c289e7c150cb1c 100644 (file)
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.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) 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: ifiter_ioctl.c,v 1.44.18.14 2008/12/01 04:02:15 marka Exp $ */
+/* $Id: ifiter_ioctl.c,v 1.44.18.15 2008/12/01 23:45:57 tbox Exp $ */
 
 /*! \file
  * \brief
@@ -104,7 +104,7 @@ struct isc_interfaceiter {
 #ifdef __linux
 #ifndef IF_NAMESIZE
 # ifdef IFNAMSIZ
-#  define IF_NAMESIZE  IFNAMSIZ  
+#  define IF_NAMESIZE  IFNAMSIZ
 # else
 #  define IF_NAMESIZE 16
 # endif
@@ -394,7 +394,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
                (void) close(iter->socket6);
   socket6_failure:
 #endif
- 
+
        isc_mem_put(mctx, iter, sizeof(*iter));
        return (result);
 }
@@ -906,7 +906,7 @@ internal_next4(isc_interfaceiter_t *iter) {
 #endif
 
        REQUIRE(iter->ifc.ifc_len == 0 ||
-               iter->pos < (unsigned int) iter->ifc.ifc_len);
+               iter->pos < (unsigned int) iter->ifc.ifc_len);
 
 #ifdef __linux
        if (linux_if_inet6_next(iter) == ISC_R_SUCCESS)
@@ -939,7 +939,7 @@ internal_next6(isc_interfaceiter_t *iter) {
 #ifdef ISC_PLATFORM_HAVESALEN
        struct LIFREQ *ifrp;
 #endif
-       
+
        if (iter->result6 != ISC_R_SUCCESS && iter->result6 != ISC_R_IGNORE)
                return (iter->result6);
 

diff --git a/lib/isc/unix/include/isc/offset.h b/lib/isc/unix/include/isc/offset.h
index a591ddcac55e0f97bc8933fe14f86d56140f7b86..eedf23b60e9ecd2198e3875c125597bc21d4814c 100644 (file)
--- a/lib/isc/unix/include/isc/offset.h
+++ b/lib/isc/unix/include/isc/offset.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: offset.h,v 1.11.18.3 2008/12/01 04:02:15 marka Exp $ */
+/* $Id: offset.h,v 1.11.18.4 2008/12/01 23:45:57 tbox Exp $ */
 
 #ifndef ISC_OFFSET_H
 #define ISC_OFFSET_H 1

diff --git a/lib/isc/unix/include/isc/strerror.h b/lib/isc/unix/include/isc/strerror.h
index 5b5a214b0f8a4e950b14351d7001f6e65ae2b2c7..5913b05b05646b2f52bdc5f9e4f0228738e7e7b0 100644 (file)
--- a/lib/isc/unix/include/isc/strerror.h
+++ b/lib/isc/unix/include/isc/strerror.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) 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: strerror.h,v 1.4.18.3 2008/12/01 04:02:15 marka Exp $ */
+/* $Id: strerror.h,v 1.4.18.4 2008/12/01 23:45:57 tbox Exp $ */
 
 #ifndef ISC_STRERROR_H
 #define ISC_STRERROR_H