From 957aaf312118f0a78795e046a89df7f652c1e5f1 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 17 Sep 2010 12:31:09 +0000
Subject: [PATCH] Fixed: FS#1317 - Do not store Zone files in BIND plugin that
do not have a ns record
---
server/plugins-available/bind_plugin.inc.php | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index 65329204e3..02a301a6a0 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -252,7 +252,16 @@ class bind_plugin {
//* Only write the master file for the current server
$tmps = $app->db->queryAllRecords("SELECT origin, xfer, also_notify FROM dns_soa WHERE active = 'Y' AND server_id=".$conf["server_id"]);
$zones = array();
+
+ //* Check if the current zone that triggered this function has at least one NS record
+ $rec_num = $app->db->queryOneRecord("SELECT count(id) as ns FROM dns_rr WHERE type = 'NS' AND zone = ".$data['new']['id']." AND active = 'Y'");
+ if($rec_num['ns'] == 0) {
+ $exclude_zone = $data['new']['origin'];
+ } else {
+ $exclude_zone = '';
+ }
+ //* Loop trough zones
foreach($tmps as $tmp) {
$options = '';
@@ -263,10 +272,12 @@ class bind_plugin {
}
if(trim($tmp['also_notify']) != '') $options .= ' also-notify {'.str_replace(',',';',$tmp['also_notify']).";};\n";
- $zones[] = array( 'zone' => substr($tmp['origin'],0,-1),
- 'zonefile_path' => $dns_config['bind_zonefiles_dir'].'/pri.'.substr($tmp['origin'],0,-1),
- 'options' => $options
- );
+ if($tmp['origin'] != $exclude_zone) {
+ $zones[] = array( 'zone' => substr($tmp['origin'],0,-1),
+ 'zonefile_path' => $dns_config['bind_zonefiles_dir'].'/pri.'.substr($tmp['origin'],0,-1),
+ 'options' => $options
+ );
+ }
}
$tpl = new tpl();
--
GitLab