From: Mark Andrews <marka@isc.org>
Date: Fri, 12 Sep 2014 21:55:57 +0000 (+1000)
Subject: update named-checkzone manpage for SPF changes
X-Git-Tag: v9.11.0a1~1378^2~35
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=48b093c864d518bb35f2137a26c24568e2eab60c;p=thirdparty%2Fbind9.git

update named-checkzone manpage for SPF changes
---

diff --git a/bin/check/named-checkzone.8 b/bin/check/named-checkzone.8
index f83ca3b131f..865c2709a50 100644
--- a/bin/check/named-checkzone.8
+++ b/bin/check/named-checkzone.8
@@ -266,7 +266,7 @@ so that include directives in the configuration file are processed as if run by
 .PP
 \-T \fImode\fR
 .RS 4
-Check if Sender Policy Framework records (TXT and SPF) both exist or both don't exist. A warning is issued if they don't match. Possible modes are
+Check if Sender Policy Framework (SPF) records exist and issues a warning if an SPF-formatted TXT record is not also present. Possible modes are
 \fB"warn"\fR
 (default),
 \fB"ignore"\fR.
diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index f2b2724d4bf..9e827f398d3 100644
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@@ -440,10 +440,10 @@
 	<term>-T <replaceable class="parameter">mode</replaceable></term>
 	<listitem>
 	  <para>
-	    Check if Sender Policy Framework records (TXT and SPF)
-	    both exist or both don't exist.  A warning is issued
-	    if they don't match.  Possible modes are
-	    <command>"warn"</command> (default), <command>"ignore"</command>.
+	    Check if Sender Policy Framework (SPF) records exist
+	    and issues a warning if an SPF-formatted TXT record is
+	    not also present.  Possible modes are <command>"warn"</command>
+	    (default), <command>"ignore"</command>.
 	  </para>
 	</listitem>
       </varlistentry>
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index ede2594a897..224c31a9444 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -2896,8 +2896,8 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) {
 
  checkspf:
 		/*
-		 * Check if there is a type TXT spf record without a type SPF
-		 * RRset being present.
+		 * Check if there is a type SPF record without an
+		 * SPF-formatted type TXT record also being present.
 		 */
 		if (!DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKSPF))
 			goto next;