update copyright notice

diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index ab8066656ca03bf2ed0e28dec92cf112f93de198..d5ef50b7f6d130b7b58bd4361144120ef14f38a7 100644 (file)
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index ecb0faece6885de48e2f5f412c5e9c6c6a1124bb..5966d16389f6288d41963ce27a3282c6610348dc 100644 (file)
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007-2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007-2009, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c
index 3491828248144cbd9e644ebd876834c44b8fa8e1..0a195c4ea99a11614d98d4b4a4c78cdc8dccde1f 100644 (file)
--- a/bin/dnssec/dnssec-importkey.c
+++ b/bin/dnssec/dnssec-importkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  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
@@ -280,9 +280,9 @@ main(int argc, char **argv) {
 
        while ((ch = isc_commandline_parse(argc, argv, "D:f:hK:P:v:")) != -1) {
                switch (ch) {
-                case 'D':
-                        if (setdel)
-                                fatal("-D specified more than once");
+               case 'D':
+                       if (setdel)
+                               fatal("-D specified more than once");
 
                        setdel = ISC_TRUE;
                        del = strtotime(isc_commandline_argument, now, now);
@@ -292,13 +292,13 @@ main(int argc, char **argv) {
                        if (strlen(dir) == 0U)
                                fatal("directory must be non-empty string");
                        break;
-                case 'P':
-                        if (setpub)
-                                fatal("-P specified more than once");
+               case 'P':
+                       if (setpub)
+                               fatal("-P specified more than once");
 
                        setpub = ISC_TRUE;
                        pub = strtotime(isc_commandline_argument, now, now);
-                        break;
+                       break;
                case 'f':
                        filename = isc_commandline_argument;
                        break;

diff --git a/bin/tests/system/digcomp.pl b/bin/tests/system/digcomp.pl
index e2ff72e9bf622c31203b43719599d32d9b85638b..980ed440544d8efd4d372d0778c8d92e9d0f1c03 100644 (file)
--- a/bin/tests/system/digcomp.pl
+++ b/bin/tests/system/digcomp.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2004, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/dnssec/ns3/siginterval.example.db.in b/bin/tests/system/dnssec/ns3/siginterval.example.db.in
index 52202fb31b4bf6d0579e49cb6e3828262ecf323f..0e05beb7022ea1ea5408a9cff0007dcd99e1b8f3 100644 (file)
--- a/bin/tests/system/dnssec/ns3/siginterval.example.db.in
+++ b/bin/tests/system/dnssec/ns3/siginterval.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2013  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

diff --git a/bin/tests/system/dnssec/ns3/siginterval1.conf b/bin/tests/system/dnssec/ns3/siginterval1.conf
index 45d449db762936ee711acc0151dabce8cb88d358..bb3d4b81ba7cc838d1d97694256600588f56eeca 100644 (file)
--- a/bin/tests/system/dnssec/ns3/siginterval1.conf
+++ b/bin/tests/system/dnssec/ns3/siginterval1.conf
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2013  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.
+ */
+
 zone "siginterval.example" {
         type master;
         allow-update { any; };

diff --git a/bin/tests/system/dnssec/ns3/siginterval2.conf b/bin/tests/system/dnssec/ns3/siginterval2.conf
index 996aa624035c61f6e196b284492384c87f0ba549..a4fc5ad413c404aa455b7c8162c7c177b26bd033 100644 (file)
--- a/bin/tests/system/dnssec/ns3/siginterval2.conf
+++ b/bin/tests/system/dnssec/ns3/siginterval2.conf
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2013  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.
+ */
+
 zone "siginterval.example" {
         type master;
         allow-update { any; };

diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh
index 5d4ed600fe90ebe094ea67697ef12c529a6d590c..4ac5421d144ee065261b43aed1c36b556792fe93 100644 (file)
--- a/bin/tests/system/dnssec/setup.sh
+++ b/bin/tests/system/dnssec/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2007, 2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh
index b6cbd7e40bdec9346bf6d893b170f9d72da33e61..e9d465fdb61286c877c117eb2cf59d87f2d4ae65 100644 (file)
--- a/bin/tests/system/glue/tests.sh
+++ b/bin/tests/system/glue/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c
index 4a4025a7649e511aea5749245ec97cf06437f413..2b950d5a3b9cf302b9c70cb8a2a0f75f9eb631aa 100644 (file)
--- a/lib/dns/dst_parse.c
+++ b/lib/dns/dst_parse.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/dst_result.c b/lib/dns/dst_result.c
index 30aa1fad92bd7869adab2d165532c97f60ac46c9..e9f7b06ab2521dd63c61129822c47b9cd6cd025e 100644 (file)
--- a/lib/dns/dst_result.c
+++ b/lib/dns/dst_result.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/include/dns/diff.h b/lib/dns/include/dns/diff.h
index 8109dfde16a60a9e1d38f2e90f8ec85f1fa4b559..e3d6afcf487f6ff1f051896628ffbf289e3065c1 100644 (file)
--- a/lib/dns/include/dns/diff.h
+++ b/lib/dns/include/dns/diff.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h
index 0b8e5205669ae0ade6d3fb7e52bbb319217e6b82..3601cc608235658908d62c35ddb7d29ac86b3c00 100644 (file)
--- a/lib/dns/include/dns/journal.h
+++ b/lib/dns/include/dns/journal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -238,7 +238,7 @@ dns_journal_rollforward(isc_mem_t *mctx, dns_db_t *db, unsigned int options,
 /*%<
  * Roll forward (play back) the journal file "filename" into the
  * database "db".  This should be called when the server starts
- * after a shutdown or crash. 
+ * after a shutdown or crash.
  *
  * Requires:
  *\li   'mctx' is a valid memory context.

diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index 872a490de61daea183cb7b219582f812b1c8cfbc..b9531a579284a37a3e373b55236f77ec98051ed5 100644 (file)
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
index a24baae68306396f516e1e10e80fb76fae2cf363..61e64db0d4a5a07a95b54347f5f139e7a1d595ab 100644 (file)
--- a/lib/dns/openssldsa_link.c
+++ b/lib/dns/openssldsa_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -522,7 +522,7 @@ openssldsa_tofile(const dst_key_t *key, const char *directory) {
 
        if (key->keydata.dsa == NULL)
                return (DST_R_NULLKEY);
-       
+
        if (key->external) {
                priv.nelements = 0;
                return (dst__privstruct_writefile(key, &priv, directory));

diff --git a/lib/dns/opensslgost_link.c b/lib/dns/opensslgost_link.c
index 325a7c0042d40c3458514b4c260c54aed52e08be..74d8646477b80af4fef82b5ced377a17b488aa30 100644 (file)
--- a/lib/dns/opensslgost_link.c
+++ b/lib/dns/opensslgost_link.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010-2013  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

diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index 894c7ae4595c18fe5f0a2d65206971242ac60862..d3454a5ea40f2b0b754f37f3470aee9294f20200 100644 (file)
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index ee233663e3328a5c8ed0c9d7f93796cee4be01bf..b64a6234aec4c11e0850867241fa4a1164f5dd68 100644 (file)
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/tests/rdata_test.c b/lib/dns/tests/rdata_test.c
index d31fc09b2ebfb7142d50fdb39c3a67c293ccb35f..37f9792f068cd29e8cbcff8fdad8a18558ac9c38 100644 (file)
--- a/lib/dns/tests/rdata_test.c
+++ b/lib/dns/tests/rdata_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013  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
@@ -126,7 +126,7 @@ ATF_TC_BODY(edns_client_subnet, tc) {
                {
                        /* source too long for IPv4 */
                        {
-                         0x00, 0x08, 0x00,    8, 
+                         0x00, 0x08, 0x00,    8,
                          0x00, 0x01,   33, 0x00,
                          0x00, 0x00, 0x00, 0x00
                        },
@@ -147,7 +147,7 @@ ATF_TC_BODY(edns_client_subnet, tc) {
                {
                        /* scope too long for IPv4 */
                        {
-                         0x00, 0x08, 0x00,    8, 
+                         0x00, 0x08, 0x00,    8,
                          0x00, 0x01, 0x00,   33,
                          0x00, 0x00, 0x00, 0x00
                        },
@@ -168,16 +168,16 @@ ATF_TC_BODY(edns_client_subnet, tc) {
                {
                        /* length too short for source generic */
                        {
-                         0x00, 0x08, 0x00,    5, 
+                         0x00, 0x08, 0x00,    5,
                          0x00, 0x00,   17, 0x00,
-                         0x00, 0x00, 
+                         0x00, 0x00,
                        },
                        19, ISC_FALSE
                },
                {
                        /* length too short for source ipv4 */
                        {
-                         0x00, 0x08, 0x00,    7, 
+                         0x00, 0x08, 0x00,    7,
                          0x00, 0x01,   32, 0x00,
                          0x00, 0x00, 0x00, 0x00
                        },
@@ -220,7 +220,7 @@ ATF_TC_BODY(edns_client_subnet, tc) {
                                            dns_rdatatype_opt, &source,
                                            &dctx, 0, &target);
                dns_decompress_invalidate(&dctx);
-               if (test_data[i].ok) 
+               if (test_data[i].ok)
                        ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
                else
                        ATF_REQUIRE(result != ISC_R_SUCCESS);