From a98c9a3332ddb9e36a2dd32c0737f806003051ef Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Tue, 6 Jun 2023 16:29:21 +0200 Subject: [PATCH 1/3] Replace one more occurance of slave_zone_file_prefix, #6520 --- server/plugins-available/bind_plugin.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php index 5beeed2c56..815e3ca144 100644 --- a/server/plugins-available/bind_plugin.inc.php +++ b/server/plugins-available/bind_plugin.inc.php @@ -460,7 +460,7 @@ class bind_plugin { } //* Ensure that the named slave directory is writable by the named user - $slave_record_dir = $dns_config['bind_zonefiles_dir'].'/'.$this->slave_zone_file_prefix(); + $slave_record_dir = $dns_config['bind_zonefiles_dir'].'/'.$dns_config['bind_zonefiles_slaveprefix']; if(!@is_dir($slave_record_dir)) mkdir($slave_record_dir, 0770, true); chown($slave_record_dir, $dns_config['bind_user']); chgrp($slave_record_dir, $dns_config['bind_group']); -- GitLab From 545a09c05966f43e4b579c8d5d4d9357788bcd40 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Tue, 6 Jun 2023 18:50:44 +0000 Subject: [PATCH 2/3] Update bind_plugin.inc.php --- server/plugins-available/bind_plugin.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php index 815e3ca144..b973fe9d85 100644 --- a/server/plugins-available/bind_plugin.inc.php +++ b/server/plugins-available/bind_plugin.inc.php @@ -460,7 +460,11 @@ class bind_plugin { } //* Ensure that the named slave directory is writable by the named user - $slave_record_dir = $dns_config['bind_zonefiles_dir'].'/'.$dns_config['bind_zonefiles_slaveprefix']; + if(!empty($dns_config['bind_zonefiles_slaveprefix'])) { + $slave_record_dir = dirname($dns_config['bind_zonefiles_dir'].'/'.$dns_config['bind_zonefiles_slaveprefix']); + } else { + $slave_record_dir = $dns_config['bind_zonefiles_dir']; + } if(!@is_dir($slave_record_dir)) mkdir($slave_record_dir, 0770, true); chown($slave_record_dir, $dns_config['bind_user']); chgrp($slave_record_dir, $dns_config['bind_group']); -- GitLab From 7c397031a69f735c9c7c74c2fbd34be34d0b9e00 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Tue, 6 Jun 2023 20:40:03 +0000 Subject: [PATCH 3/3] Update bind_plugin.inc.php --- server/plugins-available/bind_plugin.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php index b973fe9d85..452ef1b9ae 100644 --- a/server/plugins-available/bind_plugin.inc.php +++ b/server/plugins-available/bind_plugin.inc.php @@ -461,7 +461,8 @@ class bind_plugin { //* Ensure that the named slave directory is writable by the named user if(!empty($dns_config['bind_zonefiles_slaveprefix'])) { - $slave_record_dir = dirname($dns_config['bind_zonefiles_dir'].'/'.$dns_config['bind_zonefiles_slaveprefix']); + $slave_record_dir = $dns_config['bind_zonefiles_dir'].'/'.$dns_config['bind_zonefiles_slaveprefix']; + if(substr($slave_record_dir,-1) != '/') $slave_record_dir = dirname($slave_record_dir); } else { $slave_record_dir = $dns_config['bind_zonefiles_dir']; } -- GitLab