aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Wyatt <stuart@gogglespisano.com>2015-04-16 11:39:04 -0700
committerStuart Wyatt <stuart@gogglespisano.com>2015-04-16 11:44:09 -0700
commit1a1186794d1cdc1e9e9d027b84222e5bc56c9bdd (patch)
treefdc753ec80e675cb6392eb8c92c64416d8824a66
parent7789dc6b863df5ed2e93ac5a1786dc84016dc6dc (diff)
downloadpfsense-packages-1a1186794d1cdc1e9e9d027b84222e5bc56c9bdd.tar.gz
pfsense-packages-1a1186794d1cdc1e9e9d027b84222e5bc56c9bdd.tar.bz2
pfsense-packages-1a1186794d1cdc1e9e9d027b84222e5bc56c9bdd.zip
BIND - refix rate-limit option and add comments to avoid the problem in the future
Put the {} back around the rate-limit values without any whitespace. {} around PHP variables in <<< text output to named.conf might get confused with {} text in namd.conf. Added this comment in those areas to help prevent future problems. // curly braces in the following <<<EOD are PHP {$variable}, not named.conf text { value; } bump package version
-rw-r--r--config/bind/bind.inc9
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
4 files changed, 10 insertions, 5 deletions
diff --git a/config/bind/bind.inc b/config/bind/bind.inc
index c61382cb..58cd1584 100644
--- a/config/bind/bind.inc
+++ b/config/bind/bind.inc
@@ -162,6 +162,7 @@ function bind_sync()
$bind_conf .= "#Do not edit this file!!!\n\n";
$bind_conf .= "$rndc_bindconf\n";
$bind_conf .= "$bind_global_settings\n";
+ // curly braces in the following <<<EOD are PHP {$variable}, not named.conf text { value; }
$bind_conf .= <<<EOD
options {
@@ -177,10 +178,11 @@ EOD;
if ($bind['rate_enabled'] == "on") {
$rate_limit = ($bind['rate_limit'] ? $bind['rate_limit'] : "15");
$log_only = ($bind['log_only'] == "no" ? "no" : "yes");
+ // curly braces in the following <<<EOD are PHP {$variable}, not named.conf text { value; }
$bind_conf .= <<<EOD
rate-limit {
- responses-per-second $rate_limit;
- log-only $log_only;
+ responses-per-second {$rate_limit};
+ log-only {$log_only};
};
EOD;
@@ -249,6 +251,7 @@ EOD;
$log_categories = explode(",", $bind['log_options']);
$log_severity = ($bind['log_severity'] ? $bind['log_severity'] : 'default');
if (sizeof($log_categories) > 0 && $log_categories[0] != "") {
+ // curly braces in the following <<<EOD are PHP {$variable}, not named.conf text { value; }
$bind_conf .= <<<EOD
logging {
@@ -854,6 +857,7 @@ function bind_write_rcfile()
$rc = array();
$BIND_LOCALBASE = "/usr/local";
$rc['file'] = 'named.sh';
+ // curly braces in the following <<<EOD are PHP {$variable}, not named.conf text { value; }
$rc['start'] = <<<EOD
if [ -z "`ps auxw | grep "[n]amed {$ip_version} -c /etc/namedb/named.conf"|awk '{print $2}'`" ];then
{$BIND_LOCALBASE}/sbin/named {$ip_version} -c /etc/namedb/named.conf -u bind -t /cf/named/
@@ -863,6 +867,7 @@ EOD;
killall -9 named 2>/dev/null
sleep 2
EOD;
+ // curly braces in the following <<<EOD are PHP {$variable}, not named.conf text { value; }
$rc['restart'] = <<<EOD
if [ -z "`ps auxw | grep "[n]amed {$ip_version} -c /etc/namedb/named.conf"|awk '{print $2}'`" ];then
{$BIND_LOCALBASE}/sbin/named {$ip_version} -c /etc/namedb/named.conf -u bind -t /cf/named/
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 1e3306a6..a535339d 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.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.6P1_3 pkg v 0.3.8</version>
+ <version>9.9.6P1_3 pkg v 0.3.9</version>
<status>RC</status>
<required_version>2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/bind/bind.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index f6f41e5f..b9aeee61 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.5P1_5 pkg v 0.3.8</version>
+ <version>9.9.5P1_5 pkg v 0.3.9</version>
<status>RC</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/bind/bind.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 38ab13b9..bdec2a5d 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.5P1_5 pkg v 0.3.8</version>
+ <version>9.9.5P1_5 pkg v 0.3.9</version>
<status>RC</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/bind/bind.xml</config_file>