update copyright notice

diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index 07710e7ec3fdeaf6ad9e45679a00fd02c8134085..ef754ff29af987923ffe084ee0d0329ed1cbbba2 100644 (file)
--- 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 0ddb606bedfa576f29ddb4165499f30fa15efdf4..fdc3ddc2caabd6e05734f7e82c9aff43c177a7cb 100644 (file)
--- 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 0c7b9ae48698baa86e33848dabefbd35b723c870..c25dd1eaf2e290f953a5442de3e11577e267f0c0 100644 (file)
--- 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, 2010  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2007, 2009, 2010, 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
@@ -38,6 +38,7 @@
       <year>2007</year>
       <year>2009</year>
       <year>2010</year>
+      <year>2013</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>

diff --git a/bin/named/config.c b/bin/named/config.c
index 48bcee6b6b05d1edba853debf2aa42f2f2c40f5d..25ebac4db0c19916e18ced38d4ca536153705662 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.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) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/spf/clean.sh b/bin/tests/system/spf/clean.sh
index 9c95122b661c610fa557130d4f3904c56560e37e..2e3a0eebc0a1d867d4de17a0980ccae7b2b804f6 100644 (file)
--- 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 6269f99f50b74683714c9c11be2037e66fe55148..5f63161f49247c58be28b8f5f04c9f294f7e2202 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -2351,19 +2351,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);