michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Deal with case where allow-transfer block doesn't even exist https://github.com/webmin/webmin/issues/832

Browse Source
This commit is contained in:
Jamie Cameron
2018-02-28 21:21:59 -08:00
parent 9f869be140
commit 8dd9b5eedc
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bind8/slave_add.cgi
View File

@@ -123,8 +123,8 @@ foreach my $s (@add) {
my $sip = &to_ipaddress($s->{'host'});
my %zerrs;
foreach my $zone (grep { !$rgot{$_->{'name'}} } @zones) {
my ($slaveerr) = &create_on_slaves($zone->{'name'}, $myip,
undef, [ $s->{'host'} ], $zone->{'view'});
my ($slaveerr) = &create_on_slaves($zone->{'name'},
$myip, undef, [ $s->{'host'} ], $zone->{'view'});
if ($slaveerr) {
$zerrs{$slaveerr->[0]->{'host'}} ||=
$slaveerr->[1];
@@ -148,11 +148,23 @@ foreach my $s (@add) {
next if (!$z || !$sip);
foreach my $d ("also-notify", "allow-transfer") {
my $n = &find($d, $z->{'members'});
next if (!$n);
my ($got) = grep { $_->{'name'} eq $sip }
@{$n->{'members'}};
next if ($got);
push(@{$n->{'members'}}, { 'name' => $sip });
if ($n) {
# Block already exists
my ($got) =
grep { $_->{'name'} eq $sip }
@{$n->{'members'}};
next if ($got);
push(@{$n->{'members'}},
{ 'name' => $sip });
}
else {
# Need to add block
$n = { 'name' => $d,
'type' => 1,
'members' => [
{ 'name' => $sip },
] };
}
&lock_file($z->{'file'});
&save_directive($z, $d, [ $n ], 1);
&flush_file_lines();