From c32a681ef2b5698aa79627229f1468c19e6d80df Mon Sep 17 00:00:00 2001
From: Tinderbox User <tbox@isc.org>
Date: Tue, 17 Sep 2013 23:45:29 +0000
Subject: [PATCH] update copyright notice

---
 bin/dig/dighost.c                             |  4 ++--
 bin/dig/nslookup.c                            |  2 +-
 bin/dig/nslookup.docbook                      |  3 ++-
 .../dnssec/ns3/siginterval.example.db.in      |  2 +-
 bin/tests/system/dnssec/ns3/siginterval1.conf | 22 ++++++++++++++++---
 bin/tests/system/dnssec/ns3/siginterval2.conf | 22 ++++++++++++++++---
 bin/tests/system/dnssec/setup.sh              |  2 +-
 lib/dns/diff.c                                |  2 +-
 lib/dns/include/dns/masterdump.h              |  2 +-
 lib/dns/include/dns/rdata.h                   |  2 +-
 lib/dns/masterdump.c                          |  2 +-
 lib/dns/nsec3.c                               |  2 +-
 lib/dns/zone.c                                | 20 ++++++++---------
 13 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 61feec92ab..94b4182077 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -1900,7 +1900,7 @@ next_origin(dig_query_t *query) {
 		 * about finding the next entry.
 		 */
 		return (ISC_FALSE);
-	
+
 	/*
 	 * Check for a absolute name or ndots being met.
 	 */
@@ -1912,7 +1912,7 @@ next_origin(dig_query_t *query) {
 	    (dns_name_isabsolute(name) ||
 	     (int)dns_name_countlabels(name) > ndots))
 		return (ISC_FALSE);
-		
+
 	if (query->lookup->origin == NULL && !query->lookup->need_search)
 		/*
 		 * Then we just did rootorg; there's nothing left.
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index 1d23f2faaa..cf64e58998 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/dig/nslookup.docbook b/bin/dig/nslookup.docbook
index 3f7d1f6fb8..dc9d857b4e 100644
--- a/bin/dig/nslookup.docbook
+++ b/bin/dig/nslookup.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2007, 2010  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2007, 2010, 2013  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
@@ -74,6 +74,7 @@
       <year>2006</year>
       <year>2007</year>
       <year>2010</year>
+      <year>2013</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
diff --git a/bin/tests/system/dnssec/ns3/siginterval.example.db.in b/bin/tests/system/dnssec/ns3/siginterval.example.db.in
index 52202fb31b..0e05beb702 100644
--- a/bin/tests/system/dnssec/ns3/siginterval.example.db.in
+++ b/bin/tests/system/dnssec/ns3/siginterval.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2013  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/ns3/siginterval1.conf b/bin/tests/system/dnssec/ns3/siginterval1.conf
index 45d449db76..fb0b342f59 100644
--- a/bin/tests/system/dnssec/ns3/siginterval1.conf
+++ b/bin/tests/system/dnssec/ns3/siginterval1.conf
@@ -1,7 +1,23 @@
+/*
+ * Copyright (C) 2013  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.
+ */
+
 zone "siginterval.example" {
-        type master;
-        allow-update { any; };
+	type master;
+	allow-update { any; };
 	sig-validity-interval 1 23;
 	auto-dnssec maintain;
-        file "siginterval.example.db";
+	file "siginterval.example.db";
 };
diff --git a/bin/tests/system/dnssec/ns3/siginterval2.conf b/bin/tests/system/dnssec/ns3/siginterval2.conf
index 996aa62403..03be0d2bae 100644
--- a/bin/tests/system/dnssec/ns3/siginterval2.conf
+++ b/bin/tests/system/dnssec/ns3/siginterval2.conf
@@ -1,7 +1,23 @@
+/*
+ * Copyright (C) 2013  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.
+ */
+
 zone "siginterval.example" {
-        type master;
-        allow-update { any; };
+	type master;
+	allow-update { any; };
 	sig-validity-interval 35 28;
 	auto-dnssec maintain;
-        file "siginterval.example.db";
+	file "siginterval.example.db";
 };
diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh
index 8fc0ba5f44..8ba38e9db6 100644
--- 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, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2011-2013  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/diff.c b/lib/dns/diff.c
index 4462a50861..0d4db49eae 100644
--- a/lib/dns/diff.c
+++ b/lib/dns/diff.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h
index d13b1f029f..ef449f6d0f 100644
--- a/lib/dns/include/dns/masterdump.h
+++ b/lib/dns/include/dns/masterdump.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2011-2013  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/dns/rdata.h b/lib/dns/include/dns/rdata.h
index 1bb6d2258b..6b6c66c76f 100644
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 0f92a69105..40d2c23ae7 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2013  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/nsec3.c b/lib/dns/nsec3.c
index 6753137248..8832244097 100644
--- a/lib/dns/nsec3.c
+++ b/lib/dns/nsec3.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2008-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2008-2013  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/zone.c b/lib/dns/zone.c
index 7e63d862fa..0bf8744480 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -2713,14 +2713,14 @@ set_resigntime(dns_zone_t *zone) {
 	dns_rdataset_init(&rdataset);
 	dns_fixedname_init(&fixed);
 
-        ZONEDB_LOCK(&zone->dblock, isc_rwlocktype_read);
-        if (zone->db != NULL)
-                dns_db_attach(zone->db, &db);
-        ZONEDB_UNLOCK(&zone->dblock, isc_rwlocktype_read);
-        if (db == NULL) {
-                isc_time_settoepoch(&zone->resigntime);
-                return;
-        }
+	ZONEDB_LOCK(&zone->dblock, isc_rwlocktype_read);
+	if (zone->db != NULL)
+		dns_db_attach(zone->db, &db);
+	ZONEDB_UNLOCK(&zone->dblock, isc_rwlocktype_read);
+	if (db == NULL) {
+		isc_time_settoepoch(&zone->resigntime);
+		return;
+	}
 
 	result = dns_db_getsigningtime(db, &rdataset,
 				       dns_fixedname_name(&fixed));
@@ -2735,8 +2735,8 @@ set_resigntime(dns_zone_t *zone) {
 	nanosecs %= 1000000000;
 	isc_time_set(&zone->resigntime, resign, nanosecs);
  cleanup:
-        dns_db_detach(&db);
-        return;
+	dns_db_detach(&db);
+	return;
 }
 
 static isc_result_t