update copyright notice / whitespace

diff --git a/bin/named/include/named/query.h b/bin/named/include/named/query.h
index 3e6c03a775c4c62ae737a87e99a2bc34e3e32db0..70649dc2d9ad3f3196cd08fbca0bcd6ded64e6b9 100644 (file)
--- a/bin/named/include/named/query.h
+++ b/bin/named/include/named/query.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2010, 2011, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2010, 2011, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/named/query.c b/bin/named/query.c
index 7aa95ce49bfca77c2fa462f884b449f2d41b294e..608b24ace935aeec3f0f775e756b587254364d89 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -6302,7 +6302,7 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset,
         */
        result = dns_name_concatenate(found, dns_rootname, found, NULL);
        RUNTIME_CHECK(result == ISC_R_SUCCESS);
-       
+
        dns_name_copy(found, name, NULL);
        if (dns_rdataset_isassociated(rdataset))
                dns_rdataset_disassociate(rdataset);
@@ -7568,7 +7568,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
                                goto ncache_nxrrset;
                        }
                        tresult = redirect2(client, fname, rdataset, &node,
-                                            &db, &version, type);
+                                           &db, &version, type);
                        if (tresult == DNS_R_CONTINUE) {
                                client->query.redirect.qtype = qtype;
                                client->query.redirect.rdataset = rdataset;

diff --git a/bin/tests/system/redirect/clean.sh b/bin/tests/system/redirect/clean.sh
index 83568a8f86af51d6a51808a097560e7ed3337b20..161d110bdd3c1bf045484474b2f04b2170c8fc2e 100644 (file)
--- a/bin/tests/system/redirect/clean.sh
+++ b/bin/tests/system/redirect/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-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/redirect/ns3/example.db b/bin/tests/system/redirect/ns3/example.db
index 2877e9d878c597573cae7d142f71715b99e5e85c..ad723103b25d9363d40b457f8c32005e6275cc24 100644 (file)
--- a/bin/tests/system/redirect/ns3/example.db
+++ b/bin/tests/system/redirect/ns3/example.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2011  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/redirect/ns3/named.conf b/bin/tests/system/redirect/ns3/named.conf
index d8e14054cd7293a13a9a8dd630b611dc3710ec1a..9a658143dff64216a7eceb3ce27c3b14b9704726 100644 (file)
--- a/bin/tests/system/redirect/ns3/named.conf
+++ b/bin/tests/system/redirect/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  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/redirect/ns3/redirect.db b/bin/tests/system/redirect/ns3/redirect.db
index 3b4efd716b07fd32cab84775d8d7091133835819..a45245d3c00ef65e4acae486e88c7492b16b6cba 100644 (file)
--- a/bin/tests/system/redirect/ns3/redirect.db
+++ b/bin/tests/system/redirect/ns3/redirect.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2011  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/redirect/ns3/root.db b/bin/tests/system/redirect/ns3/root.db
index 3273989a1dca6a43460846437b204301d425bc7e..1252f5ef120e60c634abd0d85b96904f607f61ae 100644 (file)
--- a/bin/tests/system/redirect/ns3/root.db
+++ b/bin/tests/system/redirect/ns3/root.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2011  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/redirect/ns3/sign.sh b/bin/tests/system/redirect/ns3/sign.sh
index fe5d562e82c002307e3bbc48d952599c587dd081..ea9e4c2647ecb1f4912116a42333478c5a73ce6d 100644 (file)
--- a/bin/tests/system/redirect/ns3/sign.sh
+++ b/bin/tests/system/redirect/ns3/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2011, 2012, 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/redirect/ns4/example.db.in b/bin/tests/system/redirect/ns4/example.db.in
index cf08a09a6be0d030ecc7cf0a58d0b9ec7c5a9a35..e58564d72ca2ed96955234bf175ae693ded630bf 100644 (file)
--- a/bin/tests/system/redirect/ns4/example.db.in
+++ b/bin/tests/system/redirect/ns4/example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 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

diff --git a/bin/tests/system/redirect/ns4/named.conf b/bin/tests/system/redirect/ns4/named.conf
index 2d077aa3dcbf0cf3ca51e5cbfc71aa83b43498bf..c3bb0ee73826d26b94f4d2f650ab62077168a1a9 100644 (file)
--- a/bin/tests/system/redirect/ns4/named.conf
+++ b/bin/tests/system/redirect/ns4/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

diff --git a/bin/tests/system/redirect/setup.sh b/bin/tests/system/redirect/setup.sh
index 388999838a4679b8ebbf8411fba2fc39d2025bac..de13469c3009d4cb60a9a8124eaac51b6571ba09 100644 (file)
--- a/bin/tests/system/redirect/setup.sh
+++ b/bin/tests/system/redirect/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-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/redirect/tests.sh b/bin/tests/system/redirect/tests.sh
index f2894334c8a03a774c9bc3863c72d4b2d55b4b27..d0e54497d750e9155739316fad94c55505ab5ecf 100644 (file)
--- a/bin/tests/system/redirect/tests.sh
+++ b/bin/tests/system/redirect/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-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