aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2013-11-06 23:31:04 -0200
committerMarcello Coutinho <marcellocoutinho@gmail.com>2013-11-06 23:31:04 -0200
commitc123b3690d02f074d150a8cc12dfb61b3476560d (patch)
tree0954e285ba2c9b8cb33e3a77083fe4c517bc3b9b
parent9d7aa2ced576e6a607007a50942c14ca2d3d8696 (diff)
downloadpfsense-packages-c123b3690d02f074d150a8cc12dfb61b3476560d.tar.gz
pfsense-packages-c123b3690d02f074d150a8cc12dfb61b3476560d.tar.bz2
pfsense-packages-c123b3690d02f074d150a8cc12dfb61b3476560d.zip
bind - fix ipv6 listening check and add SPF record to bind zone.
-rw-r--r--config/bind/bind.inc6
-rw-r--r--config/bind/bind_zones.xml1
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
4 files changed, 6 insertions, 5 deletions
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>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index ae4e7f8e..ce6329a7 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -53,7 +53,7 @@
<descr><![CDATA[The most widely used name server software]]></descr>
<website>http://www.isc.org/downloads/BIND/</website>
<category>Services</category>
- <version>9.9.4 pkg v 0.3</version>
+ <version>9.9.4 pkg v 0.3.1</version>
<status>RC</status>
<required_version>2.1</required_version>
<config_file>http://www.pfsense.com/packages/config/bind/bind.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 05f2f1b0..825f7766 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -53,7 +53,7 @@
<descr><![CDATA[The most widely used name server software]]></descr>
<website>http://www.isc.org/downloads/BIND/</website>
<category>Services</category>
- <version>9.9.4 pkg v 0.3</version>
+ <version>9.9.4 pkg v 0.3.1</version>
<status>RC</status>
<required_version>2.1</required_version>
<config_file>http://www.pfsense.com/packages/config/bind/bind.xml</config_file>