From 641bf8b28095edd8f01b775449c034e3023c8eb7 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Wed, 27 Apr 2011 17:17:25 -0700
Subject: [PATCH] Better detect transfer failures, make default transfer IPs
 box bigger

---
 bind8/bind8-lib.pl | 4 ++--
 bind8/xfer.cgi     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bind8/bind8-lib.pl b/bind8/bind8-lib.pl
index 1146393be..2355b45a6 100755
--- a/bind8/bind8-lib.pl
+++ b/bind8/bind8-lib.pl
@@ -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) {
diff --git a/bind8/xfer.cgi b/bind8/xfer.cgi
index fe16a4c93..e415d6be0 100755
--- a/bind8/xfer.cgi
+++ b/bind8/xfer.cgi
@@ -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);