From c123b3690d02f074d150a8cc12dfb61b3476560d Mon Sep 17 00:00:00 2001
From: Marcello Coutinho <marcellocoutinho@gmail.com>
Date: Wed, 6 Nov 2013 23:31:04 -0200
Subject: bind - fix ipv6 listening check and add SPF record to bind zone.

---
 config/bind/bind.inc       | 6 +++---
 config/bind/bind_zones.xml | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/bind/bind.inc b/config/bind/bind.inc
index e680099f..3b108c82 100644
--- a/config/bind/bind.inc
+++ b/config/bind/bind.inc
@@ -179,8 +179,8 @@ EOD;
 				$listenon=(pfSense_get_interface_addresses(convert_friendly_interface_to_real_interface_name($listenon)));
 				if (is_ipaddr($listenon['ipaddr']))
 					$bind_listenon .= $listenon['ipaddr']."; ";
-				elseif(is_ipaddrv6($listenon['ipaddr']))
-					$bind_listenonv6 .= $listenon['ipaddr']."; ";
+				if(is_ipaddrv6($listenon['ipaddr6']))
+					$bind_listenonv6 .= $listenon['ipaddr6']."; ";
 			}	
 		}
 	}
@@ -429,7 +429,7 @@ EOD;
 							$hostname = (preg_match("/(MX|NS)/",$zone['row'][$y]['hosttype'])?"@":$zone['row'][$y]['hostname']);
 							$hosttype = $zone['row'][$y]['hosttype'];
 							$hostdst = $zone['row'][$y]['hostdst'];
-							if (preg_match("/[a-zA-Z]/",$hostdst) && $hosttype !="TXT")
+							if (preg_match("/[a-zA-Z]/",$hostdst) && !preg_match("/(TXT|SPF))/",$hosttype))
 								$hostdst .= ".";
 							$hostvalue = $zone['row'][$y]['hostvalue'];
 							
diff --git a/config/bind/bind_zones.xml b/config/bind/bind_zones.xml
index 7fde01a7..77893417 100644
--- a/config/bind/bind_zones.xml
+++ b/config/bind/bind_zones.xml
@@ -364,6 +364,7 @@
                                 <option><name>SRV</name><value>SRV</value></option>
                                 <option><name>PTR</name><value>PTR</value></option>
                                 <option><name>TXT</name><value>TXT</value></option>
+                                <option><name>SPF</name><value>SPF</value></option>
                         </options>
                         </rowhelperfield>
                         <rowhelperfield>
-- 
cgit v1.2.3