From 1a1186794d1cdc1e9e9d027b84222e5bc56c9bdd Mon Sep 17 00:00:00 2001
From: Stuart Wyatt <stuart@gogglespisano.com>
Date: Thu, 16 Apr 2015 11:39:04 -0700
Subject: 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
---
 config/bind/bind.inc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'config')

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/
-- 
cgit v1.2.3