From e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 10 May 2012 12:31:27 -0400
Subject: [PATCH] Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch.

---
 server/plugins-available/bind_dlz_plugin.inc.php |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/plugins-available/bind_dlz_plugin.inc.php b/server/plugins-available/bind_dlz_plugin.inc.php
index e1af955..b0ca870 100644
--- a/server/plugins-available/bind_dlz_plugin.inc.php
+++ b/server/plugins-available/bind_dlz_plugin.inc.php
@@ -77,7 +77,12 @@
 		global $conf;
 		
 		if(isset($conf['bind']['installed']) && $conf['bind']['installed'] == true) {
-			return true;
+			// Temporarily disabled until the installer supports the automatic creation of the necessary 
+			// database or at least to select between filebased nd db based bind, as not all bind versions 
+			// support dlz out of the box. To enable this plugin manually, create a symlink from the plugins-enabled
+			// directory to this file in the plugins-available directory.
+			return false;
+			//return true;
 		} else {
 			return false;
 		}
@@ -344,4 +349,4 @@
 		unset($_db);
 	}
 } // end class
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1