update copyright notice

diff --git a/bin/named/logconf.c b/bin/named/logconf.c
index a43654ea7a88fd180980f0670cd12bbb8bf53797..abc418de7f4bab0418107331bedeb11db1af2642 100644 (file)
--- a/bin/named/logconf.c
+++ b/bin/named/logconf.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006, 2011  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: logconf.c,v 1.35.18.6 2011/03/04 17:12:18 smann Exp $ */
+/* $Id: logconf.c,v 1.35.18.7 2011/03/05 23:47:51 tbox Exp $ */
 
 /*! \file */
 
@@ -130,7 +130,7 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *lctx) {
        }
 
        type = ISC_LOG_TONULL;
-       
+
        if (fileobj != NULL) {
                const cfg_obj_t *pathobj = cfg_tuple_get(fileobj, "file");
                const cfg_obj_t *sizeobj = cfg_tuple_get(fileobj, "size");
@@ -140,7 +140,7 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *lctx) {
                isc_offset_t size = 0;
 
                type = ISC_LOG_TOFILE;
-               
+
                if (versionsobj != NULL && cfg_obj_isuint32(versionsobj))
                        versions = cfg_obj_asuint32(versionsobj);
                if (versionsobj != NULL && cfg_obj_isstring(versionsobj) &&
@@ -219,17 +219,17 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *lctx) {
 
        if (result == ISC_R_SUCCESS && type == ISC_LOG_TOFILE) {
                FILE *fp;
-               
+
                /*
                 * Test to make sure that file is a plain file.
                 * Fix defect #22771
                */
-                result = isc_file_isplainfile(dest.file.name);
-                if (result == ISC_R_SUCCESS || 
+               result = isc_file_isplainfile(dest.file.name);
+               if (result == ISC_R_SUCCESS ||
                    result == ISC_R_FILENOTFOUND) {
                        /*
                         * Test that the file can be opened, since
-                        * isc_log_open() can't effectively report 
+                        * isc_log_open() can't effectively report
                         * failures when called in
                         * isc_log_doit().
                         */
@@ -237,7 +237,7 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *lctx) {
                        if (result != ISC_R_SUCCESS) {
                                syslog(LOG_ERR,
                                        "isc_stdio_open '%s' failed: %s",
-                                       dest.file.name, 
+                                       dest.file.name,
                                        isc_result_totext(result));
                                fprintf(stderr,
                                        "isc_stdio_open '%s' failed: %s",

diff --git a/bin/tests/system/logfileconfig/clean.sh b/bin/tests/system/logfileconfig/clean.sh
index b720fb695ebe3bbd010fbe80eabb8d29bff17cd6..4ff31068b5226394e3e63f9c659c9715bf01d304 100644 (file)
--- a/bin/tests/system/logfileconfig/clean.sh
+++ b/bin/tests/system/logfileconfig/clean.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.2.8.2 2011/03/04 17:12:18 smann Exp $
+# $Id: clean.sh,v 1.2.8.3 2011/03/05 23:47:52 tbox Exp $
 
 #
 # Clean up after log file tests

diff --git a/bin/tests/system/logfileconfig/ns1/rndc.conf b/bin/tests/system/logfileconfig/ns1/rndc.conf
index 4d0eeaed6302237ca396856e5646120674363547..4fc0904b16bf70cafa43202ac10e45b63e192809 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/rndc.conf
+++ b/bin/tests/system/logfileconfig/ns1/rndc.conf
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2011  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
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $Id: rndc.conf,v 1.1.8.3 2011/03/05 23:47:52 tbox Exp $ */
+
 options {
        default-server localhost;
 };

diff --git a/bin/tests/system/logfileconfig/ns1/root.db b/bin/tests/system/logfileconfig/ns1/root.db
index 01e639af570cc19801b241e90aaa7590872b8aa9..550b8a9fab421cb1d1851238d6cad084136cab34 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/root.db
+++ b/bin/tests/system/logfileconfig/ns1/root.db
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2011  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.2.8.2 2011/03/04 17:12:19 smann Exp $
+; $Id: root.db,v 1.2.8.3 2011/03/05 23:47:52 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/logfileconfig/tests.sh b/bin/tests/system/logfileconfig/tests.sh
index 4411ef1ebf39a8c4f73b04621a4030c8bc58239f..1da41bfd068f7c7d82ce06c04f52cd1a4b057590 100644 (file)
--- a/bin/tests/system/logfileconfig/tests.sh
+++ b/bin/tests/system/logfileconfig/tests.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.2.8.2 2011/03/04 17:12:18 smann Exp $
+# $Id: tests.sh,v 1.2.8.3 2011/03/05 23:47:52 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index 3025e056c3eb9f0f1028e46d8040791648697a27..d07a3806cb130220f1079ee5e41a7492d6b13465 100644 (file)
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2006, 2011  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 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: start.pl,v 1.5.18.5 2011/03/04 17:12:18 smann Exp $
+# $Id: start.pl,v 1.5.18.6 2011/03/05 23:47:52 tbox Exp $
 
 # Framework for starting test servers.
 # Based on the type of server specified, check for port availability, remove

diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index cfd828b7035cb01657ee8cd6de3fc83ae25a25df..a5aedd25c0570bcb5e7e20826b38bfba000f97a7 100644 (file)
--- a/lib/isc/include/isc/file.h
+++ b/lib/isc/include/isc/file.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2009, 2011  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: file.h,v 1.27.18.5 2011/03/04 17:12:19 smann Exp $ */
+/* $Id: file.h,v 1.27.18.6 2011/03/05 23:47:52 tbox Exp $ */
 
 #ifndef ISC_FILE_H
 #define ISC_FILE_H 1
@@ -195,7 +195,7 @@ isc_file_isplainfile(const char *name);
  *             The file does not exist. This return code comes from
  *             errno=ENOENT when stat returns -1. This code is mentioned
  *             here, because in logconf.c, it is the one rcode that is
- *             permitted in addition to ISC_R_SUCCESS. This is done since 
+ *             permitted in addition to ISC_R_SUCCESS. This is done since
  *             the next call in logconf.c is to isc_stdio_open(), which
  *             will create the file if it can.
  *\li  #other ISC_R_* errors translated from errno

diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index 530cf739a19b979d5cf6c0a8bd373141580aa838..15707c950cba29e2b43a3e2dd2b0acff1a85e218 100644 (file)
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: file.c,v 1.47.18.5 2011/03/04 17:12:20 smann Exp $ */
+/* $Id: file.c,v 1.47.18.6 2011/03/05 23:47:52 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c
index 573b0a99232ffe94deb629d065c1180c5dae11ec..c9b6c13a2d8d590d784e173d39e6cff377f37729 100644 (file)
--- a/lib/isc/unix/stdio.c
+++ b/lib/isc/unix/stdio.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2011  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: stdio.c,v 1.6.18.1 2011/03/04 17:12:20 smann Exp $ */
+/* $Id: stdio.c,v 1.6.18.2 2011/03/05 23:47:52 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index c40c3ec461ef69180f27064045de0c1b5356384c..d0f92275b062833a0b573096035d4afcab063201 100644 (file)
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2011  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: file.c,v 1.29.18.1 2011/03/04 17:12:20 smann Exp $ */
+/* $Id: file.c,v 1.29.18.2 2011/03/05 23:47:52 tbox Exp $ */
 
 #include <config.h>
 
@@ -213,9 +213,9 @@ isc_file_getmodtime(const char *file, isc_time_t *time) {
                         &time->absolute))
        {
                close(fh);
-                errno = EINVAL;
-                return (isc__errno2result(errno));
-        }
+               errno = EINVAL;
+               return (isc__errno2result(errno));
+       }
        close(fh);
        return (ISC_R_SUCCESS);
 }
@@ -229,23 +229,23 @@ isc_file_settime(const char *file, isc_time_t *time) {
        if ((fh = open(file, _O_RDWR | _O_BINARY)) < 0)
                return (isc__errno2result(errno));
 
-        /*
+       /*
         * Set the date via the filedate system call and return.  Failing
-         * this call implies the new file times are not supported by the
-         * underlying file system.
-         */
+        * this call implies the new file times are not supported by the
+        * underlying file system.
+        */
        if (!SetFileTime((HANDLE) _get_osfhandle(fh),
                         NULL,
                         &time->absolute,
                         &time->absolute))
        {
                close(fh);
-                errno = EINVAL;
-                return (isc__errno2result(errno));
-        }
+               errno = EINVAL;
+               return (isc__errno2result(errno));
+       }
 
        close(fh);
-        return (ISC_R_SUCCESS);
+       return (ISC_R_SUCCESS);
 
 }
 
@@ -474,7 +474,7 @@ isc_file_progname(const char *filename, char *progname, size_t namelen) {
                return (ISC_R_SUCCESS);
        }
 
-       /* 
+       /*
         * Copy the result to the buffer
         */
        len = p - s;