update copyright notice / whitespace

diff --git a/bin/named/server.c b/bin/named/server.c
index ab09cd381b58332a30986fd0aaf2a38df25ad6b0..3031fc2efdb33a667d6d16a9f4a118bb69228442 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -10631,7 +10631,7 @@ mkey_dumpzone(dns_view_t *view, isc_buffer_t **text) {
                        snprintf(buf, sizeof(buf), "\n\n    name: %s", nbuf);
                        CHECK(putstr(text, buf));
                }
-                       
+
 
                for (result = dns_rdataset_first(kdset);
                     result == ISC_R_SUCCESS;

diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh
index fbb26797b24ef1335855d92a04bdb4b72ade2560..de785bec65f86af8a265bdb77742a493c07ec840 100644 (file)
--- a/bin/tests/system/dnssec/ns3/sign.sh
+++ b/bin/tests/system/dnssec/ns3/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2006-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006-2015  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/tests/system/dnssec/ns5/named1.conf b/bin/tests/system/dnssec/ns5/named1.conf
index 1a13a9f776435c25044ab33dcf0c5b9c3dd4313b..a680117d3919b787d907cde3041d9112235fe85f 100644 (file)
--- a/bin/tests/system/dnssec/ns5/named1.conf
+++ b/bin/tests/system/dnssec/ns5/named1.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2015  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/ns5/named2.conf b/bin/tests/system/dnssec/ns5/named2.conf
index 5b60285e2799a256824827cdfd0efaeb6cc5935c..dbf4038e6559b850041ac3eb870fb6ca37616602 100644 (file)
--- a/bin/tests/system/dnssec/ns5/named2.conf
+++ b/bin/tests/system/dnssec/ns5/named2.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2015  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
@@ -40,19 +39,19 @@ options {
 };
 
 view root {
-        match-destinations { 127.0.0.1; };
+       match-destinations { 127.0.0.1; };
 
-        zone "." {
-                type master;
-                file "root.db.signed";
-        };
+       zone "." {
+               type master;
+               file "root.db.signed";
+       };
 };
 
 view other {
 include "revoked.conf";
 
-        zone "." {
-                type static-stub;
-                server-addresses { 127.0.0.1; };
-        };
+       zone "." {
+               type static-stub;
+               server-addresses { 127.0.0.1; };
+       };
 };

diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh
index 0418f9510fd0572aa22cb2eef5991c8c5a777924..4145c34068d0a01a9b05f05dd93e58bc9f197675 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-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2011-2015  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/mkeys/README b/bin/tests/system/mkeys/README
index eb77d7bc79973cb53a7df8ed3d65a2fd181afdcb..0fc98746deef4df65524600d60170cca644ba028 100644 (file)
--- a/bin/tests/system/mkeys/README
+++ b/bin/tests/system/mkeys/README
@@ -1,3 +1,6 @@
+Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This is for testing managed-keys, in particular with problems
 with RFC 5011 Automated Updates of DNSSEC Trust Anchors.
 

diff --git a/bin/tests/system/mkeys/clean.sh b/bin/tests/system/mkeys/clean.sh
index dfd44a4eb97802f07c6c8ac60c7d4e79fcf8424e..07209ba1e85d6a42ad6847e7b521ba87842ea241 100644 (file)
--- a/bin/tests/system/mkeys/clean.sh
+++ b/bin/tests/system/mkeys/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015  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/mkeys/ns1/named1.conf b/bin/tests/system/mkeys/ns1/named1.conf
index 4298cd451d36da00cb4fc0c02e1ad1d2c9a1005b..3c93c199bdd0e0aeb66505de37ba62836bd0ff0f 100644 (file)
--- a/bin/tests/system/mkeys/ns1/named1.conf
+++ b/bin/tests/system/mkeys/ns1/named1.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2015  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/mkeys/ns1/named2.conf b/bin/tests/system/mkeys/ns1/named2.conf
index 4324524ff760bf6ebe58202e763755e2a3e85748..fe722133d1cd427904816a7d689ddcb0d1a5616f 100644 (file)
--- a/bin/tests/system/mkeys/ns1/named2.conf
+++ b/bin/tests/system/mkeys/ns1/named2.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2015  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/mkeys/ns1/root.db b/bin/tests/system/mkeys/ns1/root.db
index 461d78894b040301c15d7d91397859dfaf0fa0a6..c690d9342a5451037a48ab4076106f39b2a804d2 100644 (file)
--- a/bin/tests/system/mkeys/ns1/root.db
+++ b/bin/tests/system/mkeys/ns1/root.db
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007, 2010, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2015  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/mkeys/ns1/sign.sh b/bin/tests/system/mkeys/ns1/sign.sh
index fde0e159472b007e7bbccf795ad44ae5df262eaf..1d62468fc4610915cd7d8d1d57066de16b1c8b95 100644 (file)
--- a/bin/tests/system/mkeys/ns1/sign.sh
+++ b/bin/tests/system/mkeys/ns1/sign.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2006-2014  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2003  Internet Software Consortium.
+# Copyright (C) 2015  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/mkeys/ns2/named.conf b/bin/tests/system/mkeys/ns2/named.conf
index 9da4fcbdc367911f45d1a68df70bc76f7b8f7f05..895668f4e9a770eb8d65c55406baca45fb2527f5 100644 (file)
--- a/bin/tests/system/mkeys/ns2/named.conf
+++ b/bin/tests/system/mkeys/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015  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
@@ -27,11 +27,11 @@ options {
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion yes;
-        notify no;
+       notify no;
        dnssec-enable yes;
        dnssec-validation auto;
        bindkeys-file "managed.conf";
-        servfail-ttl 0;
+       servfail-ttl 0;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/mkeys/ns3/named.conf b/bin/tests/system/mkeys/ns3/named.conf
index c6ef9f7af6b90aa2edf4247661d959e930b67273..a1481ed39f8aa5c5f04ba1037d7e45f9fe5f12ea 100644 (file)
--- a/bin/tests/system/mkeys/ns3/named.conf
+++ b/bin/tests/system/mkeys/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015  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
@@ -27,7 +27,7 @@ options {
        listen-on { 10.53.0.3; };
        listen-on-v6 { none; };
        recursion yes;
-        notify no;
+       notify no;
        dnssec-enable yes;
        dnssec-validation yes;
        bindkeys-file "managed.conf";

diff --git a/bin/tests/system/mkeys/setup.sh b/bin/tests/system/mkeys/setup.sh
index a205bba8bab132c39d304033f2cefc1358f2dc4d..bf3bc7ebc635913875443e71508c5574434dfdd1 100644 (file)
--- a/bin/tests/system/mkeys/setup.sh
+++ b/bin/tests/system/mkeys/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2007, 2009, 2011-2015  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000, 2001  Internet Software Consortium.
+# Copyright (C) 2015  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/mkeys/tests.sh b/bin/tests/system/mkeys/tests.sh
index 5408a35c80894ac0814ac3481a6c71e8a76a40cf..143f77b820c076b6f2c3ba978c7a307935891054 100644 (file)
--- a/bin/tests/system/mkeys/tests.sh
+++ b/bin/tests/system/mkeys/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2002  Internet Software Consortium.
+# Copyright (C) 2015  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/include/dns/keytable.h b/lib/dns/include/dns/keytable.h
index 94669c270c97a747a40f30116e869d5c4a9abe95..99ccff0c15677bef99913ce97b12a89bd30bcc84 100644 (file)
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2010, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2010, 2014, 2015  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/nta.h b/lib/dns/include/dns/nta.h
index e8d4259c327f9802e3f13d3e37e8aab2bc421d6b..b0ba46ae18a50b357f70c9d0d144acb2afee990d 100644 (file)
--- a/lib/dns/include/dns/nta.h
+++ b/lib/dns/include/dns/nta.h
@@ -185,7 +185,7 @@ isc_result_t
 dns_ntatable_totext(dns_ntatable_t *ntatable, isc_buffer_t **buf);
 /*%<
  * Dump the NTA table to buffer at 'buf'
- * 
+ *
  * Requires:
  * \li   "ntatable" is a valid table.
  *

diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c
index bb550ca6314ca3b36beb0b79d63dc51b41779cc1..6436a6512f5b0eab3880155fff5da292c4f02de0 100644 (file)
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2010, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2010, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -564,7 +564,7 @@ putstr(isc_buffer_t **b, const char *str) {
        result = isc_buffer_reserve(b, strlen(str));
        if (result != ISC_R_SUCCESS)
                return (result);
-       
+
        isc_buffer_putstr(*b, str);
        return (ISC_R_SUCCESS);
 }

diff --git a/lib/dns/nta.c b/lib/dns/nta.c
index c9291617d9ef30ba4d394f4ead488d72e5454619..1e472909c2802617fc3f1e390384d444cd9899bc 100644 (file)
--- a/lib/dns/nta.c
+++ b/lib/dns/nta.c
@@ -510,7 +510,7 @@ putstr(isc_buffer_t **b, const char *str) {
        result = isc_buffer_reserve(b, strlen(str));
        if (result != ISC_R_SUCCESS)
                return (result);
-       
+
        isc_buffer_putstr(*b, str);
        return (ISC_R_SUCCESS);
 }
@@ -540,7 +540,7 @@ dns_ntatable_totext(dns_ntatable_t *ntatable, isc_buffer_t **buf) {
                if (node->data != NULL) {
                        dns_nta_t *n = (dns_nta_t *) node->data;
                        char nbuf[DNS_NAME_FORMATSIZE];
-                       char tbuf[ISC_FORMATHTTPTIMESTAMP_SIZE];
+                       char tbuf[ISC_FORMATHTTPTIMESTAMP_SIZE];
                        char obuf[DNS_NAME_FORMATSIZE +
                                  ISC_FORMATHTTPTIMESTAMP_SIZE +
                                  sizeof("expired:  \n")];

diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c
index 1e5741863fa91248d56611584e35090bce944873..00cf084eb62ab7748e5b5e619cc731cd5ce62b4c 100644 (file)
--- a/lib/dns/rdata/generic/keydata_65533.c
+++ b/lib/dns/rdata/generic/keydata_65533.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2011-2013, 2015  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
@@ -200,17 +200,17 @@ totext_keydata(ARGS_TOTEXT) {
 
                        isc_stdtime_get(&now);
 
-                       RETERR(str_totext(tctx->linebreak, target)); 
+                       RETERR(str_totext(tctx->linebreak, target));
                        RETERR(str_totext("; next refresh: ", target));
                        isc_time_set(&t, refresh, 0);
                        isc_time_formathttptimestamp(&t, rbuf, sizeof(rbuf));
                        RETERR(str_totext(rbuf, target));
 
                        if (add == 0) {
-                               RETERR(str_totext(tctx->linebreak, target)); 
+                               RETERR(str_totext(tctx->linebreak, target));
                                RETERR(str_totext("; no trust", target));
                        } else {
-                               RETERR(str_totext(tctx->linebreak, target)); 
+                               RETERR(str_totext(tctx->linebreak, target));
                                if (add < now) {
                                        RETERR(str_totext("; trusted since: ",
                                                          target));
@@ -225,7 +225,7 @@ totext_keydata(ARGS_TOTEXT) {
                        }
 
                        if (remove != 0) {
-                               RETERR(str_totext(tctx->linebreak, target)); 
+                               RETERR(str_totext(tctx->linebreak, target));
                                RETERR(str_totext("; removal pending: ",
                                                  target));
                                isc_time_set(&t, remove, 0);

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 2e409ce172cb09ab711105e9010e7b5e1646b28a..c0577f38eb0f09aa712fd03c39463d16708eeb1d 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -8999,7 +8999,7 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) {
                                        deletekey = ISC_TRUE;
                                        newkey = ISC_TRUE;
                                        keydata.removehd = 0;
-                                       keydata.addhd = 
+                                       keydata.addhd =
                                                now + dns_zone_mkey_month;
                                } else if (keydata.addhd > now)
                                        pending++;

diff --git a/lib/isc/buffer.c b/lib/isc/buffer.c
index 8e785f284866e8ac8781d71747ae7f6ee2fb71d7..ed680880837d336a4a55a798a07196e8ee26adc9 100644 (file)
--- a/lib/isc/buffer.c
+++ b/lib/isc/buffer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2012, 2014, 2015  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/isc/httpd.c b/lib/isc/httpd.c
index 3a4e47653412331b7c7028cce44ca1ec91cf4637..e4eeab9937381f4e99120742b5aae695dbfbe22a 100644 (file)
--- a/lib/isc/httpd.c
+++ b/lib/isc/httpd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008, 2010-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006-2008, 2010-2015  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/isc/tests/time_test.c b/lib/isc/tests/time_test.c
index eb56ff9fb65ebb64b974c7415964767689b87196..66836f7feb94c8cf55ba80411ab7fef070d1a6d9 100644 (file)
--- a/lib/isc/tests/time_test.c
+++ b/lib/isc/tests/time_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2015  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/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h
index ade55247a93b944918102024575b733fcfb8197c..fd767040aeca1c4c996d671d65d6f32cc16d0bdf 100644 (file)
--- a/lib/isc/unix/include/isc/time.h
+++ b/lib/isc/unix/include/isc/time.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/win32/include/isc/time.h b/lib/isc/win32/include/isc/time.h
index bfd5bc0d622c60b3b813cb78a2e397815d68b8ce..5b97c5358830d5711cce151cddc41deecc7ef5f4 100644 (file)
--- a/lib/isc/win32/include/isc/time.h
+++ b/lib/isc/win32/include/isc/time.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2009, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2009, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any