update copyright notice

diff --git a/CHANGES b/CHANGES
index 06c5f61379b66e8abac409d1c7abb9c4a944457a..ade0cdc751191a12d628bd6dc98bc638534a26bf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,7 @@
 3723.  [cleanup]       Imported keys are now handled the same way
                        regardless of DNSSEC algorithm. [RT #35215]
 
-3722.  [bug]           Using geoip ACLs in a blackhole statement 
+3722.  [bug]           Using geoip ACLs in a blackhole statement
                        could cause a segfault. [RT #35272]
 
 3721.  [doc]           Improved documentation of the EDNS processing

diff --git a/bin/tests/system/geoip/clean.sh b/bin/tests/system/geoip/clean.sh
index 96409f0112227686b22ff5383326d47ee412b6a9..22d5e74466cfd34e4469a835d4466829c26fab2b 100644 (file)
--- a/bin/tests/system/geoip/clean.sh
+++ b/bin/tests/system/geoip/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 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/geoip/ns2/named12.conf b/bin/tests/system/geoip/ns2/named12.conf
index b7fda1249e4b00a31058cf375ac884bd2cdb8df3..a650a635d2b8eae9596ee2c344c43249f41dcc7f 100644 (file)
--- a/bin/tests/system/geoip/ns2/named12.conf
+++ b/bin/tests/system/geoip/ns2/named12.conf
@@ -19,7 +19,7 @@
 controls { /* empty */ };
 
 acl blocking {
-        geoip db country country AU;
+       geoip db country country AU;
 };
 
 options {
@@ -32,7 +32,7 @@ options {
        listen-on-v6 { none; };
        recursion no;
        geoip-directory "../data";
-        blackhole { blocking; };
+       blackhole { blocking; };
 };
 
 key rndc_key {

diff --git a/bin/tests/system/geoip/tests.sh b/bin/tests/system/geoip/tests.sh
index 51b1c4c288f2f755015915b97d24539c060591de..0a0705cbb87e9b7baacb8e2fc49cf755000eaa12 100644 (file)
--- a/bin/tests/system/geoip/tests.sh
+++ b/bin/tests/system/geoip/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 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/lib/dns/acl.c b/lib/dns/acl.c
index fc5598503a12d86a83335dc5fc32bfc2acb50391..a2d0347a2c5d701eeb5a1e90b173ada1a89f1f60 100644 (file)
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -408,7 +408,7 @@ dns_aclelement_match(const isc_netaddr_t *reqaddr,
 
 #ifdef HAVE_GEOIP
        case dns_aclelementtype_geoip:
-               if (env == NULL || env->geoip == NULL) 
+               if (env == NULL || env->geoip == NULL)
                        return (ISC_FALSE);
                return (dns_geoip_match(reqaddr, env->geoip, &e->geoip_elem));
 #endif

diff --git a/lib/dns/dst_result.c b/lib/dns/dst_result.c
index 078ea38391f8106c56857e1532c711cb256fe099..8f94caf655737071a4eae7c9c0e8081850f310c2 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, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2012-2014  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/acl.h b/lib/dns/include/dns/acl.h
index 76a6bb1e1d896971a6baed707674e790e5f6a0ba..ebcc6c791099c16357843237697a825d9973fc3b 100644 (file)
--- a/lib/dns/include/dns/acl.h
+++ b/lib/dns/include/dns/acl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 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/lib/dns/include/dst/result.h b/lib/dns/include/dst/result.h
index cf9428f6bdf4ebda95da87b00cb3ae8f492c3bfb..e180739c300c10bb8f788e7961e3035f53dac7a3 100644 (file)
--- a/lib/dns/include/dst/result.h
+++ b/lib/dns/include/dst/result.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2012, 2014  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/win32utils/readme1st.txt b/win32utils/readme1st.txt
index 6a5263757f40a611468f7050b6d676cb9d9313b9..e1051d34fb191c848c7c29587f8ae74dec444fff 100644 (file)
--- a/win32utils/readme1st.txt
+++ b/win32utils/readme1st.txt
@@ -1,6 +1,6 @@
 Copyright (C) 2004, 2005, 2007-2009, 2012-2014  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 2001, 2003  Internet Software Consortium.
-See COPYRIGHT in the main source directory for license terms.
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 NOTES ON BIND 9.10 FOR WINDOWS: