From 3bee204db22cdea59684654878d55ffac414a953 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Tue, 6 Dec 2016 15:18:24 -0800 Subject: [PATCH] Fix permissions check for dleting zones, that was breaking access to zones in views https://sourceforge.net/p/webadmin/bugs/4853/ --- bind8/delete_zone.cgi | 2 +- bind8/mass_delete.cgi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bind8/delete_zone.cgi b/bind8/delete_zone.cgi index 95855635c..039ee7c16 100755 --- a/bind8/delete_zone.cgi +++ b/bind8/delete_zone.cgi @@ -13,7 +13,7 @@ require './bind8-lib.pl'; my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'}); my ($zconf, $conf, $parent) = &zone_to_config($zone); -&can_edit_zone($zconf) || +&can_edit_zone($zone) || &error($text{'master_edelete'}); $access{'ro'} && &error($text{'master_ero'}); diff --git a/bind8/mass_delete.cgi b/bind8/mass_delete.cgi index 6ade39fff..929eee221 100755 --- a/bind8/mass_delete.cgi +++ b/bind8/mass_delete.cgi @@ -38,7 +38,7 @@ foreach my $d (split(/\0/, $in{'d'})) { else { $zconf = $conf->[$zone->{'index'}]; } - &can_edit_zone($zconf, $view) || + &can_edit_zone($zone) || &error($text{'master_edelete'}); push(@zones, [ $zconf, $view ]); push(@znames, $zconf->{'value'});