update copyright notice / whitespace

diff --git a/bin/named/server.c b/bin/named/server.c
index b3685957c34547237fbd59fd7960c99548426bf7..42f50ed1bd3f3223303dca0d9f5fbaa9cee7b68f 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -9255,7 +9255,7 @@ newzone_parse(ns_server_t *server, char *args, dns_view_t **viewp,
                bn = "addzone";
        else if (strncasecmp(args, "mod", 3) == 0)
                bn = "modzone";
-       else 
+       else
                INSIST(0);
 
        /*

diff --git a/bin/tests/system/digdelv/clean.sh b/bin/tests/system/digdelv/clean.sh
index 2db0acface49a210219044665e4240fa81717596..0f442fb59e6440df18ddb48572cd5eb2867cf852 100644 (file)
--- a/bin/tests/system/digdelv/clean.sh
+++ b/bin/tests/system/digdelv/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 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/digdelv/ns1/named.conf b/bin/tests/system/digdelv/ns1/named.conf
index 8f3cc63d8a2e5e2f0b12324cfbc15c201ca6203a..c5f047084167cee09fb4d9745b5198a9c9297618 100644 (file)
--- a/bin/tests/system/digdelv/ns1/named.conf
+++ b/bin/tests/system/digdelv/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 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/digdelv/ns1/root.db b/bin/tests/system/digdelv/ns1/root.db
index cce91c375b996715c6bc73efaf2e91420abf1908..f4316a5344521a234fa65b03a4195dbe14316ec6 100644 (file)
--- a/bin/tests/system/digdelv/ns1/root.db
+++ b/bin/tests/system/digdelv/ns1/root.db
@@ -1,4 +1,4 @@
-; Copyright (C) 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/digdelv/ns2/example.db b/bin/tests/system/digdelv/ns2/example.db
index b94dc32b8c6f37ee3b3aaca73f41a7d84e89ab2d..03d57725ce121841135b6efd4558d29d13e75513 100644 (file)
--- a/bin/tests/system/digdelv/ns2/example.db
+++ b/bin/tests/system/digdelv/ns2/example.db
@@ -1,4 +1,4 @@
-; Copyright (C) 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/digdelv/ns2/named.conf b/bin/tests/system/digdelv/ns2/named.conf
index 04bf1aadd93ced0ca00492d653b969cfdc608eb3..266e958188f260228f153717eceef0ae51e28667 100644 (file)
--- a/bin/tests/system/digdelv/ns2/named.conf
+++ b/bin/tests/system/digdelv/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 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/digdelv/ns3/named.conf b/bin/tests/system/digdelv/ns3/named.conf
index 90336637036a583ad4a4691a72e5f2573c36cc52..0b64784d4cae0a3a7ebbd29f4a350ea43cf1aa3b 100644 (file)
--- a/bin/tests/system/digdelv/ns3/named.conf
+++ b/bin/tests/system/digdelv/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 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/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index 751c12f910c4d5df1b0e8e3a5d589d85a87a25dc..9cb44965594f223c6f390ee4b34d53ba627e7bd1 100644 (file)
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 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/rpzrecurse/ns2/db.clientip1 b/bin/tests/system/rpzrecurse/ns2/db.clientip1
index 58f3817b577100e19cca0392eb51c916ccde58e5..de930582b5366855ebfba2e5d4c28cf1d920fe72 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns2/db.clientip1
+++ b/bin/tests/system/rpzrecurse/ns2/db.clientip1
@@ -1,3 +1,17 @@
+; 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
+; 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.
+
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
      NS ns

diff --git a/bin/tests/system/rpzrecurse/ns2/db.clientip2 b/bin/tests/system/rpzrecurse/ns2/db.clientip2
index a7a676ac6cef95d4b1c9cf50cfd3049dd64f9095..7d644c9660a0c212ca9b96ec777d3ea650c9350a 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns2/db.clientip2
+++ b/bin/tests/system/rpzrecurse/ns2/db.clientip2
@@ -1,3 +1,17 @@
+; 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
+; 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.
+
 $TTL 60
 @ IN SOA root.ns ns 1996072700 3600 1800 86400 60
      NS ns

diff --git a/bin/tests/system/rpzrecurse/ns2/named.clientip.conf b/bin/tests/system/rpzrecurse/ns2/named.clientip.conf
index 810237bb30ffa1c32636a39a11fdb3c8665b09c7..d62036c766e5a1cbba2cf130f4808c0f9f4df195 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns2/named.clientip.conf
+++ b/bin/tests/system/rpzrecurse/ns2/named.clientip.conf
@@ -1,16 +1,32 @@
+/*
+ * 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
+ * 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.
+ */
+
 # common configuration
 include "named.conf.header";
 
 view "recursive" {
     zone "." {
-        type hint;
-        file "root.hint";
+       type hint;
+       file "root.hint";
     };
 
     # policy configuration to be tested
     response-policy {
-        zone "clientip1";
-        zone "clientip2";
+       zone "clientip1";
+       zone "clientip2";
     } qname-wait-recurse no;
 
     # policy zones to be tested

diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index 29b50abd4174a912b0d1de78303954f8ce2236bf..650d770dbfcaece4f665eb93be805f9c82d9f7c1 100644 (file)
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/include/isc/print.h b/lib/isc/include/isc/print.h
index de66ea12a8f2e21d6ef871b3b7f3c37ba53e7455..277829fd0c8cc67e5055315e6f7a74db3f677bcf 100644 (file)
--- a/lib/isc/include/isc/print.h
+++ b/lib/isc/include/isc/print.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/print.c b/lib/isc/print.c
index a251de7b28adefc7f2f37c810b54395e773ef1e1..41ff1eaf31f711829a93bd0c181597618e45349c 100644 (file)
--- a/lib/isc/print.c
+++ b/lib/isc/print.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2010, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2010, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/tests/print_test.c b/lib/isc/tests/print_test.c
index be864de798da1ddaae73e35770787dedd2aa46fb..6923eea9e5b3d89c2db8dbc0023e0ceb9190a19f 100644 (file)
--- a/lib/isc/tests/print_test.c
+++ b/lib/isc/tests/print_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/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 9d276999084ca490166cc7adc4ca226d39930cea..010cd5b5178b7b0b2db1d72f8fc5ab5e4afb0999 100644 (file)
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/lwres/print.c b/lib/lwres/print.c
index 8a9c64aa5c0705ad9d098163120db3dafc20f630..6346c718c362b8a92291c244c2fc9b6e480d108e 100644 (file)
--- a/lib/lwres/print.c
+++ b/lib/lwres/print.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2011, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2011, 2012, 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any