update named-checkzone manpage for SPF changes

diff --git a/bin/check/named-checkzone.8 b/bin/check/named-checkzone.8
index f83ca3b131fad59fa425912704d02bd0d604d8d5..865c2709a50bd97f81fa9de06ee8e0a44a9b6dc6 100644 (file)
--- 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 f2b2724d4bff9ffd942a7741666b8e7990401fd5..9e827f398d31a6ce158e6226949be03cf3676b17 100644 (file)
--- 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 b57f19db81e880144b98b93ba4713027e37f5113..ef604542ad8d408e81f449d9e38a38c52d9523f0 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -2866,8 +2866,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;