aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@pfSense.org>2014-02-23 17:46:53 -0300
committerRenato Botelho <garga@pfSense.org>2014-02-23 17:46:53 -0300
commita3b8ffd89df4ee1440d0053635b9eaf07527da9a (patch)
tree7ca95654319a06eec40ec594986be7f781132ad1
parentec8c498ed040d1f02617be21c452921622ab5675 (diff)
parent2f3f6ecaa9ef5cae9160d1071a80f4f26938d9ed (diff)
downloadpfsense-packages-a3b8ffd89df4ee1440d0053635b9eaf07527da9a.tar.gz
pfsense-packages-a3b8ffd89df4ee1440d0053635b9eaf07527da9a.tar.bz2
pfsense-packages-a3b8ffd89df4ee1440d0053635b9eaf07527da9a.zip
Merge pull request #603 from crocomo/bind
bind - logging facility & typos
-rw-r--r--config/bind/bind.inc3
-rw-r--r--config/bind/bind_acls.xml2
-rw-r--r--config/bind/bind_zones.xml2
3 files changed, 4 insertions, 3 deletions
diff --git a/config/bind/bind.inc b/config/bind/bind.inc
index 40d626db..1818b225 100644
--- a/config/bind/bind.inc
+++ b/config/bind/bind.inc
@@ -209,8 +209,9 @@ EOD;
$restart_syslog=0;
foreach ($syslog_files as $syslog_file){
$syslog_file_data=file_get_contents($syslog_file);
- if (!preg_match("/dnsmasq,named,filterdns/",$syslog_file_data)){
+ if ( !preg_match("/dnsmasq,named,filterdns/",$syslog_file_data) || !preg_match("/'dnsmasq','named','filterdns'/",$syslog_file_data) ) {
$syslog_file_data=preg_replace("/dnsmasq,filterdns/","dnsmasq,named,filterdns",$syslog_file_data);
+ $syslog_file_data=preg_replace("/'dnsmasq','filterdns'/","'dnsmasq','named','filterdns'",$syslog_file_data);
file_put_contents($syslog_file,$syslog_file_data);
$restart_syslog++;
}
diff --git a/config/bind/bind_acls.xml b/config/bind/bind_acls.xml
index b8d10158..dbd9e29d 100644
--- a/config/bind/bind_acls.xml
+++ b/config/bind/bind_acls.xml
@@ -108,7 +108,7 @@
<type>input</type>
</field>
<field>
- <fielddescr>Enter IP or range bloc network.</fielddescr>
+ <fielddescr>Enter IP or range block network.</fielddescr>
<description>Leave blank to allow All</description>
<fieldname>none</fieldname>
<type>rowhelper</type>
diff --git a/config/bind/bind_zones.xml b/config/bind/bind_zones.xml
index be4da9cf..3506df63 100644
--- a/config/bind/bind_zones.xml
+++ b/config/bind/bind_zones.xml
@@ -126,7 +126,7 @@
<fieldname>name</fieldname>
<description><![CDATA[Enter the name for zone (ex:mydomain.com)<br>
For reverse zones, include zone ip in reverse order or following your provider instructions.(Ex: 1.168.192)<br>
- IN-ADDR.ARPA will be automaticaly included on conf files when reveser zone option is checked.]]></description>
+ IN-ADDR.ARPA will be automaticaly included on conf files when reverse zone option is checked.]]></description>
<type>input</type>
<required/>
</field>