update copyright notice

diff --git a/bin/named/include/named/query.h b/bin/named/include/named/query.h
index 7843e8ffe60044cad9abf02ad8dd03dcc23df12a..c71c8de9b23c50646e7679c0d56ba18a68aa70a1 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  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2010, 2011, 2013, 2014  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 514c2ebbaacab43f127f29918ef6619c2d2fde9d..4d2262e2321efc9fd17a380fc032812ed15d10dc 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -3826,7 +3826,7 @@ query_prefetch(ns_client_t *client, dns_name_t *qname,
        ns_client_t *dummy = NULL;
 
        if (client->view->prefetch_trigger == 0U ||
-            rdataset->ttl > client->view->prefetch_trigger ||
+           rdataset->ttl > client->view->prefetch_trigger ||
            (rdataset->attributes & DNS_RDATASETATTR_PREFETCH) == 0)
                return;
 

diff --git a/bin/python/dnssec-coverage.8 b/bin/python/dnssec-coverage.8
index 4da338e42d6cd18c65fbd4e6784ac0ea309efc8c..6c2e8a520607cbfc2dacd04620975a9bfa129b2c 100644 (file)
--- a/bin/python/dnssec-coverage.8
+++ b/bin/python/dnssec-coverage.8
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2013, 2014  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/python/dnssec-coverage.html b/bin/python/dnssec-coverage.html
index d129f9b74c5d65ada0e92172b721b1988dadc651..dbbb6ab0506bf856f432e5314f90c6e7331c9cd7 100644 (file)
--- a/bin/python/dnssec-coverage.html
+++ b/bin/python/dnssec-coverage.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2013, 2014  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/resolver/clean.sh b/bin/tests/system/resolver/clean.sh
index 5a0c8fcdd8657944be47727c79ac19f16192f1b2..1ad15720436e64eddd888034afdd2281b9aeea73 100644 (file)
--- a/bin/tests/system/resolver/clean.sh
+++ b/bin/tests/system/resolver/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008-2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008-2014  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/resolver/ns4/tld1.db b/bin/tests/system/resolver/ns4/tld1.db
index 3c28f42167d9b79ae92698553ba9aca57bfa66b1..7d017c4db48254920629ef53f2b50ce5be810ed4 100644 (file)
--- a/bin/tests/system/resolver/ns4/tld1.db
+++ b/bin/tests/system/resolver/ns4/tld1.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2012, 2014  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/resolver/ns4/tld2.db b/bin/tests/system/resolver/ns4/tld2.db
index dadacd43feb153a51b789b82371b46a27afcb88f..5a8663a721d64ee40a4a04a11efb2026bd41368b 100644 (file)
--- a/bin/tests/system/resolver/ns4/tld2.db
+++ b/bin/tests/system/resolver/ns4/tld2.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2012, 2014  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/resolver/ns5/named.conf b/bin/tests/system/resolver/ns5/named.conf
index 71d233674defd8db4e329137a071d6cf802eaccb..af8d073d567bafb482a19cc2a405da4484f29ce7 100644 (file)
--- a/bin/tests/system/resolver/ns5/named.conf
+++ b/bin/tests/system/resolver/ns5/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2013, 2014  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/resolver/ns6/example.net.db.in b/bin/tests/system/resolver/ns6/example.net.db.in
index 0402ec9edfe8f41f0fc4101590b6eee275d90b90..c45de7fe9e2aeaf70dc7bdb56b8bceeeff7ca8b8 100644 (file)
--- a/bin/tests/system/resolver/ns6/example.net.db.in
+++ b/bin/tests/system/resolver/ns6/example.net.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2010, 2014  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/resolver/ns6/named.conf b/bin/tests/system/resolver/ns6/named.conf
index 2075b1446c39b21b2bcbdea9a1471c47ff2b7b67..728b56ecab44480a041d7345582e18a776350121 100644 (file)
--- a/bin/tests/system/resolver/ns6/named.conf
+++ b/bin/tests/system/resolver/ns6/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2012-2014  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/resolver/ns7/named1.conf b/bin/tests/system/resolver/ns7/named1.conf
index 07784aaec737f8db0be84be9fe34617cfac6e44e..bf522e411082ecc14dd44dc26291d1b843515856 100644 (file)
--- a/bin/tests/system/resolver/ns7/named1.conf
+++ b/bin/tests/system/resolver/ns7/named1.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2013, 2014  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/resolver/ns7/named2.conf b/bin/tests/system/resolver/ns7/named2.conf
index 149bf526dc53654f678984c1e70ff2e6739bdeb7..b8daee05bf3da5ff0a9a3b314c8eaf18c26c87f2 100644 (file)
--- a/bin/tests/system/resolver/ns7/named2.conf
+++ b/bin/tests/system/resolver/ns7/named2.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2014  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/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 23e59d3759d5045611ad55ec1a9cb00ea0addc6f..d96fae2994e425dd7b6ba7d2bef02feb3163c64d 100755 (executable)
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009-2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2014  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/db.h b/lib/dns/include/dns/db.h
index ab50a91e7bb57bc0782bf0a5a9c92c66dcc6b90f..a4a44826c4e763fb120f71f99412811d08ad0c61 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2014  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/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index a3ba5e3500c3c724bbe499ac0d93ef9e0e19b9a3..49b5075745d2abaa5e2892be6f6941657a52f705 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2012, 2014  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/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index 2bc25a424fb86acb0e9328e48052468a2cb4357d..e11419704c2494db0f2b3f912628410a7a4b7b00 100644 (file)
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2014  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/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 5f7f0e7dbf9ce983e503e6343e3877cb79a624aa..cff940b7342b5737be8900b0352402f374eb61bd 100644 (file)
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2014  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/dns/resolver.c b/lib/dns/resolver.c
index a5d119e52c5c6bd1375b57481f00e4b1df39805c..7023a8200209a7bad156cf1c57a01face7d51ff4 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -4932,7 +4932,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo,
                                        addedrdataset = asigrdataset;
                                        result = dns_db_addrdataset(fctx->cache,
                                                                node, NULL, now,
-                                                               sigrdataset, 
+                                                               sigrdataset,
                                                                options,
                                                                addedrdataset);
                                        if (result == DNS_R_UNCHANGED)