From b38ca786e15e0205906338d993c5f2e8c62ff1a1 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Sat, 13 Sep 2014 07:55:57 +1000 Subject: [PATCH] update named-checkzone manpage for SPF changes --- bin/check/named-checkzone.8 | 2 +- bin/check/named-checkzone.docbook | 8 ++++---- lib/dns/zone.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/check/named-checkzone.8 b/bin/check/named-checkzone.8 index f83ca3b131..865c2709a5 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 f2b2724d4b..9e827f398d 100644 --- a/bin/check/named-checkzone.docbook +++ b/bin/check/named-checkzone.docbook @@ -440,10 +440,10 @@ -T mode - 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 - "warn" (default), "ignore". + 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 "warn" + (default), "ignore". diff --git a/lib/dns/zone.c b/lib/dns/zone.c index b57f19db81..ef604542ad 100644 --- 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;