X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=scripts%2Fnamed-conf;h=102f143abe912473fbc2a3a6118354a1c7ed621c;hp=a7894f510fbccbbb1ab919b2f76110c255c47718;hb=7b2bcecc03b61eb95d5ab7820dd970ec3afdbfc9;hpb=c4441d680a870752e80ad0dfd839c9fa1d24c062

diff --git a/scripts/named-conf b/scripts/named-conf
index a7894f5..102f143 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -392,6 +392,7 @@ sub zone_investigate() {
 sub zone_check_nsrrset ($$$$) {
     my ($uaddr,$wa, $name_if_auth, $glueless_ok) = @_;
     my (@s, $s, %s2g, @glue, $glue, $delgs_or_auths, $wwn, $ww);
+    my ($rcode);
     $ww= "[$uaddr] $wa";
     verbose("checking delegation by $ww");
     dig(sub {
@@ -421,7 +422,7 @@ sub zone_check_nsrrset ($$$$) {
 		unless $glueless_ok || !$needglue ||
 		       grep { has_suffix_of($s,".$_"); }
 			   @{ $cfg->{'conv_glueless'} };
-	    next;
+	    ($rcode,@glue)= lookup($s,'a','0',"glueless NS from $ww");
 	}
 	$glue= join ' ', sort @glue;
 	push @{ $glue{$s}{$glue} }, $ww;
@@ -498,7 +499,7 @@ sub zone_check_soa ($$$$) {
     $lame= 'broken' if !$lame && !defined $origin;
     if ($lame) { zone_warning("$lame server [$uaddr]",$wa); return; }
     progress(2, sprintf "%-22s %40s has %s%s",
-	     $zone, $name, $serial, $is_ns ? '' : '*');
+	     $zone, "$name [$uaddr]", $serial, $is_ns ? '' : '*');
     push @{ $soas{$got} }, $ww;
     ($rcode,@soa_addrs)= lookup($origin,'a','0',"SOA ORIGIN");
     $wwn= "SOA ORIGIN from $ww";