Better detect transfer failures, make default transfer IPs box bigger
authorJamie Cameron <jcameron@webmin.com>
Thu, 28 Apr 2011 00:17:25 +0000 (17:17 -0700)
committerJamie Cameron <jcameron@webmin.com>
Thu, 28 Apr 2011 00:17:25 +0000 (17:17 -0700)
bind8/bind8-lib.pl
bind8/xfer.cgi

index 1146393..2355b45 100755 (executable)
@@ -511,7 +511,7 @@ if ($v) {
 return &ui_table_row($_[0],
        &ui_radio("$_[1]_def", $v ? 0 : 1, [ [ 1, $text{'default'} ],
                                             [ 0, $text{'listed'} ] ])."<br>".
-       &ui_textarea($_[1], join("\n", @av), 3, 15));
+       &ui_textarea($_[1], join("\n", @av), 3, 50));
 }
 
 # save_addr_match(name, &parent, indent)
@@ -3294,7 +3294,7 @@ foreach my $ip (@$masters) {
        else {
                my $out = &backquote_logged("$dig IN AXFR ".quotemeta($dom).
                                            " \@".quotemeta($ip)." 2>&1");
-               if ($?) {
+               if ($? || $out =~ /Transfer\s+failed/) {
                        $rv{$ip} = $out;
                        }
                elsif (!$out) {
index fe16a4c..e415d6b 100755 (executable)
@@ -42,7 +42,7 @@ print "<p>\n";
 
 # Show records
 if (-r $temp) {
-       @recs = &read_zone_file($temp, $zone->{'name'}.".");
+       @recs = &read_zone_file($temp, $zone->{'name'}.".", undef, undef, 0, 1);
        print &text('xfer_count', scalar(@recs)),"<p>\n";
        }
 &unlink_file($temp);