update copyright notice

diff --git a/bin/named/logconf.c b/bin/named/logconf.c
index 573112683d61dd1a031ca36f46612be8d4d532a6..5d17ab0e60163c4c8e866ad5147385572d3b4aff 100644 (file)
--- a/bin/named/logconf.c
+++ b/bin/named/logconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-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: logconf.c,v 1.42.816.2 2011/03/05 03:08:10 marka Exp $ */
+/* $Id: logconf.c,v 1.42.816.3 2011/03/05 23:52:06 tbox Exp $ */
 
 /*! \file */
 
@@ -131,7 +131,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");
@@ -141,7 +141,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) &&
@@ -220,17 +220,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().
                         */
@@ -238,7 +238,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/ans.pl b/bin/tests/system/ans.pl
index 91b7756423fef50b72280e74d2ceb753e9004a11..a094291a4ef88587646d5efb59511178dd789c50 100644 (file)
--- a/bin/tests/system/ans.pl
+++ b/bin/tests/system/ans.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: ans.pl,v 1.2.2.2 2011/03/04 22:03:25 each Exp $
+# $Id: ans.pl,v 1.2.2.3 2011/03/05 23:52:08 tbox Exp $
 
 #
 # This is the name server from hell.  It provides canned

diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh
index 9e37a1d2bcffc836c67f4258f9386dc402d75014..81ce51a40efdb9d8934f485522748962aefe0e72 100644 (file)
--- a/bin/tests/system/ixfr/tests.sh
+++ b/bin/tests/system/ixfr/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.5.814.1 2011/03/04 22:03:25 each Exp $
+# $Id: tests.sh,v 1.5.814.2 2011/03/05 23:52:08 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/logfileconfig/clean.sh b/bin/tests/system/logfileconfig/clean.sh
index 0899f9e7f9c87eb783bd6d84b003624dc62a640e..3c64e250ccc724a8cb0427c24751f7fbe31cb697 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.4.2 2011/03/04 15:06:45 smann Exp $
+# $Id: clean.sh,v 1.2.4.3 2011/03/05 23:52:08 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..b452351767d690d4160e17ad11e9f4517aaaab3a 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.4.3 2011/03/05 23:52:08 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 fba799f5c62fbafe18847e7a0d651d13e58ea12c..38351d81047dcdba31c1e58bddd1618496600a14 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.4.2 2011/03/04 15:06:46 smann Exp $
+; $Id: root.db,v 1.2.4.3 2011/03/05 23:52:08 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 fa024db92738d035d3e9cca901b56b9ad001f45f..5280bbe82d90456f204e30db10ce517caaf3c4e0 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.4.2 2011/03/04 15:06:45 smann Exp $
+# $Id: tests.sh,v 1.2.4.3 2011/03/05 23:52:08 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/send.pl b/bin/tests/system/send.pl
index 8d9ce22a2462d4d216f5a3aff7a4b376f99d5f90..0245d0488190dbdfaac707a4f7ed5e2e2a9f12da 100644 (file)
--- a/bin/tests/system/send.pl
+++ b/bin/tests/system/send.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: send.pl,v 1.5.814.1 2011/03/04 22:03:25 each Exp $
+# $Id: send.pl,v 1.5.814.2 2011/03/05 23:52:08 tbox Exp $
 
 #
 # Send a file to a given address and port using TCP.  Used for

diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index ff1e1eb31790504af3cb78905e8945eadc85d6d6..0bf85d6e6d1dbfde30d11b651f805581f2b06223 100644 (file)
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2004-2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2008, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -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.16.54.2 2011/03/04 22:03:25 each Exp $
+# $Id: start.pl,v 1.16.54.3 2011/03/05 23:52:08 tbox Exp $
 
 # Framework for starting test servers.
 # Based on the type of server specified, check for port availability, remove

diff --git a/bin/tests/system/xfer/setup.sh b/bin/tests/system/xfer/setup.sh
index 673dc7fffa3fb4668d2b6fc165ee74511d9040af..ac07db8a4b36974a73475b3969b78ac27777462f 100644 (file)
--- a/bin/tests/system/xfer/setup.sh
+++ b/bin/tests/system/xfer/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001, 2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.5.814.1 2011/03/04 22:03:25 each Exp $
+# $Id: setup.sh,v 1.5.814.2 2011/03/05 23:52:09 tbox Exp $
 
 sh ../genzone.sh 2 3 >ns2/example.db
 sh ../genzone.sh 2 3 >ns2/tsigzone.db

diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c
index d6adbde1ac9a2f49224168a12fb684595ffb4b60..cdc180901035ed3b42311958ae21771a2957caaa 100644 (file)
--- a/lib/isc/unix/stdio.c
+++ b/lib/isc/unix/stdio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 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: stdio.c,v 1.8.814.1 2011/03/04 14:10:13 smann Exp $ */
+/* $Id: stdio.c,v 1.8.814.2 2011/03/05 23:52:09 tbox Exp $ */
 
 #include <config.h>