From 3ba59d59a2ad4068d78753635531b7625c916258 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sat, 27 Jun 2015 14:17:33 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 server/plugins-available/bind_plugin.inc.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index bb65eef..c538cb9 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -133,7 +133,11 @@
 			if($return_status === 0) {
 				$app->log("Writing BIND domain file: ".$filename, LOGLEVEL_DEBUG);
 			} else {
-				$app->log("Writing BIND domain file failed: ".$filename." ".implode(' ', $out), LOGLEVEL_WARN);
+				if($dns_config['disable_bind_log'] === 'y') {
+					$app->log("Writing BIND domain file failed: ".$filename." ".implode(' ', $out), LOGLEVEL_DEBUG);
+				} else {
+					$app->log("Writing BIND domain file failed: ".$filename." ".implode(' ', $out), LOGLEVEL_WARN);
+				}
 				rename($filename, $filename.'.err');
 			}
 			unset($tpl);

--
Gitblit v1.9.1