summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2010-08-30 18:02:33 -0400
committerScott Ullrich <sullrich@pfsense.org>2010-08-30 18:02:42 -0400
commita94e3f2016bec3f72aae2fd3e1575515ff93f5f6 (patch)
treef5d2318ac1ea5c0ac98cf2e1fe8282b61ff2521f
parent6733f0f90f544cb5107b4bdf3bc4a2bd7843b715 (diff)
downloadpfsense-a94e3f2016bec3f72aae2fd3e1575515ff93f5f6.zip
pfsense-a94e3f2016bec3f72aae2fd3e1575515ff93f5f6.tar.gz
Restart dnsmasq on change in case of dns rebinding changes
-rw-r--r--etc/inc/services.inc1
-rw-r--r--usr/local/www/edit.php2
-rw-r--r--usr/local/www/system_advanced_admin.php2
3 files changed, 4 insertions, 1 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index ab8e6e8..a0c7b5d 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -670,6 +670,7 @@ function services_dnsmasq_configure() {
}
/* Allow DNS Rebind for forwarded domains */
+ if(!isset($config['system']['webgui']['nodnsrebindcheck'])) {
if (isset($config['dnsmasq']['domainoverrides']) && is_array($config['dnsmasq']['domainoverrides'])) {
if(!isset($config['system']['webgui']['nodnsrebindcheck'])) {
foreach($config['dnsmasq']['domainoverrides'] as $override) {
diff --git a/usr/local/www/edit.php b/usr/local/www/edit.php
index 6b71ad2..6867a84 100644
--- a/usr/local/www/edit.php
+++ b/usr/local/www/edit.php
@@ -138,7 +138,7 @@ outputJavaScriptFileInline("filebrowser/browser.js");
"<?=$_SERVER['SCRIPT_NAME'];?>", {
method: "post",
postBody: "action=save&file=" + $("fbTarget").value +
- "&data=" + fileContent,
+ "&data=" + escape(fileContent),
onComplete: function(req) {
var values = req.responseText.split("|");
$("fileStatus").innerHTML = values[1];
diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index 4cdf065..e7ae297 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -189,6 +189,8 @@ if ($_POST) {
conf_mount_rw();
setup_serial_port();
+ // Restart dnsmasq in case dns rebinding toggled
+ services_dnsmasq_configure();
conf_mount_ro();
}
}
OpenPOWER on IntegriCloud