From 7541c0dce676eec100146343da1f4cbb88244ec6 Mon Sep 17 00:00:00 2001
From: Tinderbox User <tbox@isc.org>
Date: Tue, 30 Apr 2013 04:51:25 +0000
Subject: [PATCH] update copyright notice

---
 bin/check/named-checkconf.c       |  2 +-
 bin/check/named-checkzone.c       |  2 +-
 bin/check/named-checkzone.docbook |  3 ++-
 bin/tests/system/spf/clean.sh     | 14 ++++++++++++++
 lib/dns/zone.c                    |  6 +++---
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index 6e832dd6c3..0b3c508f28 100644
--- a/bin/check/named-checkconf.c
+++ b/bin/check/named-checkconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009-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/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index 5e95034179..7e779c2d17 100644
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.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) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index 4d6413a2ff..ea37fa2b57 100644
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 	       [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2007, 2009-2011, 2013  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2002  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -39,6 +39,7 @@
       <year>2009</year>
       <year>2010</year>
       <year>2011</year>
+      <year>2013</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>
diff --git a/bin/tests/system/spf/clean.sh b/bin/tests/system/spf/clean.sh
index 9c95122b66..2e3a0eebc0 100644
--- a/bin/tests/system/spf/clean.sh
+++ b/bin/tests/system/spf/clean.sh
@@ -1,2 +1,16 @@
+# 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.
+
 rm -f ns1/named.run
 rm -f ns1/named.memstats
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 00c569381e..a60ee79b94 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -2606,19 +2606,19 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) {
 		 * Check if there is a type TXT spf record without a type SPF
 		 * RRset being present.
 		 */
-	        if (!DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKSPF))
+		if (!DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKSPF))
 			goto next;
 		if (zone->rdclass != dns_rdataclass_in)
 			goto next;
 		have_spf = have_txt = ISC_FALSE;
 		result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_spf,
-                                             0, 0, &rdataset, NULL);
+					     0, 0, &rdataset, NULL);
 		if (result == ISC_R_SUCCESS) {
 			dns_rdataset_disassociate(&rdataset);
 			have_spf = ISC_TRUE;
 		}
 		result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_txt,
-                                             0, 0, &rdataset, NULL);
+					     0, 0, &rdataset, NULL);
 		if (result != ISC_R_SUCCESS)
 			goto notxt;
 		result = dns_rdataset_first(&rdataset);