From c96d54201b953f9fa379c76237eddaa8552241c9 Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Mon, 11 Apr 2016 08:09:59 -0400
Subject: [PATCH] removed unneeded db permission and enhanced error handling on low entropy
---
install/lib/installer_base.lib.php | 7 -------
server/plugins-available/bind_plugin.inc.php | 4 +++-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 93461f0..a27c81f 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -667,13 +667,6 @@
$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
}
- $query = "GRANT SELECT, UPDATE ON ?? TO ?@?";
- if ($verbose){
- echo $query ."\n";
- }
- if(!$this->dbmaster->query($query, $value['db'] . '.dns_rr', $value['user'], $host)) {
- $this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
- }
}
}
diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index d791400..8819012 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -94,7 +94,8 @@
//* Check Entropy
if (file_get_contents('/proc/sys/kernel/random/entropy_avail') < 400) {
- $app->log('DNSSEC ERROR: We are low on entropy. Not generating new Keys for '.$domain.'. Please consider installing package haveged.', LOGLEVEL_WARN);
+ $app->log('DNSSEC WARNING: We are low on entropy. This could cause server script to fail. Please consider installing package haveged.', LOGLEVEL_WARN);
+ echo "DNSSEC WARNING: We are low on entropy. This could cause server script to fail. Please consider installing package haveged.\n"
return false;
}
@@ -179,6 +180,7 @@
//* Check for available entropy
if (file_get_contents('/proc/sys/kernel/random/entropy_avail') < 200) {
$app->log('DNSSEC ERROR: We are low on entropy. This could cause server script to fail. Please consider installing package haveged.', LOGLEVEL_ERR);
+ echo "DNSSEC ERROR: We are low on entropy. This could cause server script to fail. Please consider installing package haveged.\n"
return false;
}
--
Gitblit v1.9.1