From 0bbfdce8d68ea6e896a82af7a84ff97ab5ae7a0e Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Wed, 27 Feb 2013 21:32:31 -0800
Subject: [PATCH] Fix for SPF record type

---
 bind8/CHANGELOG      | 2 ++
 bind8/records-lib.pl | 1 +
 2 files changed, 3 insertions(+)

diff --git a/bind8/CHANGELOG b/bind8/CHANGELOG
index e19311fa2..6a1abb4d8 100644
--- a/bind8/CHANGELOG
+++ b/bind8/CHANGELOG
@@ -135,3 +135,5 @@ The source IP and port for zone transfers can now be specific on the Addresses a
 Added support for zone signing using the DNSSEC-Tools suite, thanks to a patch from Suresh Krishnaswamy.
 ---- Changes since 1.600 ----
 Changed all links to zones to use the zone name instead of an index, to prevent incorrect modification during concurrent access to the module.
+---- Changes since 1.620 ----
+Added a module configuration option to use the SPF type for Sender Permitted From records.
diff --git a/bind8/records-lib.pl b/bind8/records-lib.pl
index 829e94ed8..3015b283f 100755
--- a/bind8/records-lib.pl
+++ b/bind8/records-lib.pl
@@ -265,6 +265,7 @@ while($i < @tok) {
 		# If this is an SPF record .. adjust the class
 		local $spf;
 		if ($dir{'type'} eq 'TXT' &&
+		    !$config{'spf_record'} &&
 		    ($spf=&parse_spf(@{$dir{'values'}}))) {
 			if (!@{$spf->{'other'}}) {
 				$dir{'type'} = 'SPF';