X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=scripts%2Fnamed-conf;h=b6d0c0c3966d8875a53847cfd0e126199c7768b0;hp=9360c6d59e5bb58f2511c5b4963027d4b5ed1be0;hb=d9b9590be406d6c7488d8140b9b7d22db12f3499;hpb=2db8632211ab784b7f0f0179614b705d5e0293d9

diff --git a/scripts/named-conf b/scripts/named-conf
index 9360c6d..b6d0c0c 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -4,33 +4,44 @@ use strict;
 use IO::File;
 use Data::Dumper;
 
-use vars qw($etcfile $where);
-$etcfile= "/etc/bind/chiark-conf-gen.zones";
-$where= '<built-in>';
+use vars qw($quis $mode
+	    $etcfile $where
+	    $debug $needglue $localonly $verbosity);
+
+$quis= $0; $quis =~ s,.*/,,;
 
-use vars qw($mode $verbosity $debug);
 $mode= '';
-$verbosity= 1;
+$etcfile= "/etc/bind/chiark-conf-gen.zones";
+$where= '<built-in>';
 $debug= 0;
+$needglue= 2;
+$localonly= 0;
+$verbosity= 1;
+
+use vars qw($dig_owner $dig_type $dig_rdata);
 
 while (@ARGV && $ARGV[0] =~ m/^\-/) {
     $_= shift @ARGV;
     if (s/^\-\-//) {
 	last if m/^$/;
-	if (m/^quiet$/) { $verbosity=0; }
-	elsif (m/^verbose$/) { $verbosity=2; }
-	elsif (m/^(yes|no|force)$/) { m/^./; $mode= $&; }
+	if (m/^(yes|no|force)$/) { m/^./; $mode= $&; }
 	elsif (m/^config$/) { $etcfile= loarg(); $where= '--config option'; }
+	elsif (m/^glueless$/) { $needglue--; }
+	elsif (m/^localonly$/) { $localonly=1; }
+	elsif (m/^quiet$/) { $verbosity=0; }
+	elsif (m/^verbose$/) { $verbosity=2; }
 	else { usageerr("unknown option --$_"); }
     } else {
 	s/^\-//;
 	last if m/^$/;
 	while (m/^./) {
 	    if (s/^[ynf]//) { $mode=$&; }
-	    elsif (s/^v//) { $verbosity=2; }
-	    elsif (s/^q//) { $verbosity=0; }
-	    elsif (s/^D//) { $debug=1; }
 	    elsif (s/^C//) { $etcfile= soarg(); $where= '-C option'; }
+	    elsif (s/^D//) { $debug++; }
+	    elsif (s/^g//) { $needglue--; }
+	    elsif (s/^l//) { $localonly=1; }
+	    elsif (s/^q//) { $verbosity=0; }
+	    elsif (s/^v//) { $verbosity=2; }
 	    else { usageerr("unknown option -$&"); }
 	}
     }
@@ -39,6 +50,8 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) {
 sub loarg() { usageerr("missing option value") if !@ARGV; return shift @ARGV; }
 sub soarg() { my ($rv); $rv=$_; $_=''; return length $rv ? $rv : loarg(); }
 
+usageerr("-g may be specified at most twice") if $needglue<0;
+usageerr("-D may be specified at most twice") if $debug>2;
 usageerr("must specify either -f|-y|-n or zones (and not both)")
     if !!$mode == !!@ARGV;
 
@@ -80,7 +93,7 @@ $default_output= '';
 %output_contents= ();
 
 use vars qw($check $install);
-$check= $mode !~ m/^n/;
+$check= $mode !~ m/^f/;
 $install= $mode =~ m/^[yf]/;
 
 read_config($etcfile);
@@ -88,10 +101,11 @@ debug_dump('@zone_cfg_list %zone_cfg');
 process_zones($mode ? @zone_cfg_list : @ARGV);
 debug_dump('%output_contents');
 
+exit 0;
 
 #-------------------- configuration reading
 
-sub cfg_fail ($) { die "$0: $where:\n $_[0]\n"; }
+sub cfg_fail ($) { die "$quis: $where:\n $_[0]\n"; }
 
 sub read_config ($) {
     my ($if) = @_;
@@ -113,12 +127,13 @@ sub read_config ($) {
 	    @self= split /\s+/, $2;
 	    @self_ns= @self if $1 ne '-soa';
 	    @self_soa= @self if $1 ne '-ns';
-	} elsif (m/^primary\-dir\s+(\S+)((?:\s+(\S+))??:\s+(\S+))?$/) {
+	} elsif (m/^primary\-dir\s+(\S+)((?:\s+(\S+))?:\s+(\S+))?$/) {
 	    ($dir, $prefix, $suffix) = (qualify($1),$2,$3);
-	    $suffix= '_db' if !length $suffix;
+	    $suffix= '_db' if !defined $suffix;
+	    $prefix= '' if !defined $prefix;
 	    opendir D, $dir or cfg_fail("open primary-dir $dir:\n $!");
 	    $lprefix= length $prefix; $lsuffix= length $suffix;
-	    while ($!=0, $_= readdir D) {
+	    while (defined($_= readdir D)) {
 		next if m/^\./ && !$lprefix;
 		next unless length > $lprefix+$lsuffix;
 		next unless substr($_,0,$lprefix) eq $prefix;
@@ -126,7 +141,6 @@ sub read_config ($) {
 		$z= substr($_,$lprefix,length($_)-($lprefix+$lsuffix));
 		zone_conf($z,'primary',"$dir/$_");
 	    }
-	    $! and cfg_fail("read primary-dir $dir:\n $!");
 	    closedir D or cfg_fail("close primary-dir $dir:\n $!");
 	} elsif (m/^primary\s+(\S+)\s+(\S+)$/) {
 	    zone_conf($1,'primary',qualify($2));
@@ -134,7 +148,7 @@ sub read_config ($) {
 	    zone_conf($1,'secondary','',$2);
 	} elsif (m/^stealth\s+(\S+)\s+([0-9. \t]+)$/) {
 	    zone_conf($1,'stealth','',split /\s+/, $2);
-	} elsif (m/^slave\-dir\s+(\S+)((?:\s+(\S+))??:\s+(\S+))?$/) {
+	} elsif (m/^slave\-dir\s+(\S+)((?:\s+(\S+))?:\s+(\S+))?$/) {
 	    ($slave_dir, $slave_prefix, $slave_suffix) = (qualify($1),$2,$3);
 	} elsif (m/^output\s+bind8\+(\S+)$/) {
 	    cfg_fail("default output may not apply to only some zones")
@@ -153,6 +167,7 @@ sub read_config ($) {
 sub qualify ($) {
     my ($i) = @_;
     $i= "$default_dir/$i" unless $i =~ m,^/,;
+    return $i;
 }
 
 sub zone_conf ($$@) {
@@ -191,6 +206,11 @@ sub progress ($) {
     print "$_[0]\n";
 }
 
+sub verbose ($) {
+    return if $verbosity<2;
+    print "    $_[0]\n";
+}
+
 sub process_zones (@) {
     my (@zones) = @_;
     local ($zone,$cfg);
@@ -202,11 +222,21 @@ sub process_zones (@) {
 	    };
 	progress(sprintf "%-40s %s", $zone, $$cfg{'style'});
 	if ($check) {
-	    eval { zone_check() };
+	    eval {
+		if ($localonly && $cfg->{'style'} eq 'foreign') {
+		    zone_warning("foreign zone specified with -l");
+		} elsif ($localonly && $cfg->{'style'} ne 'primary') {
+		    zone_check_local();
+		} else {
+		    zone_check_full();
+		}
+	    };
 	    zone_warning("checks failed: $@") if length $@;
 	}
 	zone_output() if $install;
     }
+    print STDERR "$quis: $warnings warnings\n" or die $!
+	if $warnings;
 }
 
 sub zone_warning ($) {
@@ -225,17 +255,26 @@ use vars qw(%delgs); # $delgs{$nameserver_list} = [ $whosaidandwhy ]
 use vars qw(%auths); # $auths{$nameserver_list} = [ $whosaidandwhy ]
 use vars qw(%glue);  # $glue{$name}{$addr_list} = [ $whosaidandwhy ]
 use vars qw(%soas);  # $soa{"$origin $serial"} = [ $whosaidandwhy ]
-use vars qw(@to_check); # ($addr,$whyask,\%delgs_or_auths,$glueless_ok, ...)
+use vars qw(%addr_is_ok %gluelesswarned);
+use vars qw(@to_check); # ($addr,$whyask,$is_auth,$glueless_ok, ...)
 use vars qw(@to_check_soa); # ($addr,$whyask, ...)
-use vars qw(%addr_is_ok);
 
-sub zone_check () {
-    my ($super_zone, @super_nsnames,
-	$super_ns, @super_ns_addrs, $super_ns_addr, $s, $wa, $zcr,
-	%nsrrset_checked, %soa_checked);
+sub zone_check_full () {
+    zone_reset();
+    zone_investigate();
+    zone_consistency();
+    zone_servers_ok();
+}
 
-    %delgs= %auths= %glue= ();
+sub zone_reset() {
+    %delgs= %auths= %glue= %soas= %gluelesswarned= %addr_is_ok= ();
     @to_check= @to_check_soa= ();
+}
+
+sub zone_investigate() {
+    my ($super_zone, @super_nsnames,
+	$super_ns, @super_ns_addrs, $s, $wa, $is_auth,
+	%nsrrset_checked, %soa_checked, $addr, $glueless_ok, $rcode);
 
     $super_zone= $zone;
     for (;;) {
@@ -246,12 +285,12 @@ sub zone_check () {
     }
     for $super_ns (@super_nsnames) {
 	$super_ns= lc $super_ns;
-	($rcode,@this_ns_addrs)= lookup($super_ns,'a','0');
-	foreach $super_ns_addr (@this_ns_addrs) {
+	($rcode,@super_ns_addrs)= lookup($super_ns,'a','0');
+	foreach $addr (@super_ns_addrs) {
 	    push @to_check,
-	         $super_ns_addr,
-		 "addr for $super_ns, server for $super_zone, parent"
-		 \%delgs, 0;
+	         $addr,
+		 "$super_ns, server for $super_zone",
+		 0, 0;
 	}
     }
     for (;;) {
@@ -259,21 +298,90 @@ sub zone_check () {
 	# nameservers that came from other NS RRsets first; otherwise
 	# we might set nsrrset_checked due to a glueless_ok check,
 	# and then not check for gluefulness later.
-	if (($addr,$wa,$nsrrset_ref,$glueless_ok,@to_check) = @to_check) {
-	    next if $nsrrset_checked{$ns}++;
-	    push @to_check_soa, $addr, $why;
-	    zone_check_nsrrset($super_ns_addr,"$addr, $wa",
-			       $delgs_or_auths,$glueless_ok);
-	} elsif (($addr,$wa) = @to_check_soa) {
-	    next if !$soa_checked{$ns}++;
-	    zone_check_soa($addr,"$addr, $wa");
+	debug_dump('@to_check @to_check_soa');
+	if (($addr,$wa,$is_auth,$glueless_ok,@to_check) = @to_check) {
+	    push @to_check_soa, $addr, $wa if $is_auth;
+	    next if $nsrrset_checked{$addr}++;
+	    zone_check_nsrrset($addr, "[$addr] $wa",
+			       $is_auth, $glueless_ok);
+	} elsif (($addr,$wa,@to_check_soa) = @to_check_soa) {
+	    next if $soa_checked{$addr}++;
+	    zone_check_soa($addr,"[$addr] $wa");
+	} else {
+	    last;
 	}
     }
-    zone_consistency();
+}
+
+sub zone_check_nsrrset ($$$$) {
+    my ($uaddr,$ww, $is_auth, $glueless_ok) = @_;
+    my (@s, $s, %s2g, @glue, $glue, $delgs_or_auths);
+    verbose("checking delegation by $ww");
+    dig(sub {
+	if ($dig_type eq 'ns' && $dig_owner eq $zone) {
+	    $s2g{lc $dig_rdata} = [ ];
+	} elsif ($dig_type eq 'a' && exists $s2g{$dig_owner}) {
+	    push @to_check,
+	         $dig_rdata,
+	         "$dig_owner, in glue from $ww",
+	         1, 0;
+	    $addr_is_ok{$dig_rdata}= "$dig_owner (NS [$uaddr])"
+		if $cfg->{'style'} eq 'stealth';
+	    push @{ $s2g{$dig_owner} }, $dig_rdata;
+	}
+    },
+	     $zone,'ns',$uaddr);
+    if (!%s2g) { zone_warning("unable to find NS RRset at $ww"); return; }
+    elsif (keys %s2g == 1) { zone_warning("only one nameserver at $ww"); }
+    @s= sort keys %s2g;
+    foreach $s (@s) {
+	@glue= @{ $s2g{$s} };
+	if (!@glue) {
+	    zone_warning("glueless NS $s,".
+			 ($needglue<=1 ? " (eg)" : "").
+			 " from $ww")
+		unless $glueless_ok || !$needglue ||
+		       ($needglue<=1 && $gluelesswarned{$s}++);
+	    next;
+	}
+	$glue= join ' ', sort @glue;
+	push @{ $glue{$s}{$glue} }, $ww;
+    }
+    $s= join ' ', @s;
+    $delgs_or_auths= $is_auth ? \%auths : \%delgs;
+    push @{ $delgs_or_auths->{$s} }, $ww;
+}
+
+sub zone_check_soa ($$) {
+    my ($uaddr,$ww) = @_;
+    my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr);
+    verbose("checking service at $ww");
+    $lame= 'dead or lame';
+    dig(sub {
+	if ($dig_type eq 'flags:') {
+	    $lame= $dig_rdata =~ m/ aa / ? '' : 'lame';
+	} elsif ($dig_type eq 'soa' && $dig_owner eq $zone && !$lame) {
+	    die "several SOAs ? $ww" if defined $origin;
+	    $got= $dig_rdata;
+	    $got =~ m/^(\S+) \d+/ or die "$got ?";
+	    $origin= $1;
+	}
+    },
+	     $zone,'soa',$uaddr);
+    $lame= 'broken' if !$lame && !defined $origin;
+    if ($lame) { zone_warning("$lame server $ww"); return; }
+    push @{ $soas{$got} }, $ww;
+    ($rcode,@soa_addrs)= lookup($origin,'a','0');
+    foreach $soa_addr (@soa_addrs) {
+	$addr_is_ok{$soa_addr}= "$origin (SOA [$uaddr])";
+	push @to_check,
+	     $soa_addr,
+             "$origin, SOA ORIGIN from $ww";
+    }
 }
 
 sub zone_consistency() {
-    my ($d, $org_ser, $origin, $a, $showok);
+    my ($d, $org_ser, $origin, $a, $h);
     zone_consistency_set('delegations',\%delgs);
     foreach $d (keys %delgs) { delete $auths{$d}; }
     zone_consistency_set('zone nameserver rrset',\%auths);
@@ -290,85 +398,59 @@ sub zone_consistency() {
 			 " eg from ".((values %{ $soas{$org_ser} })[1]));
 	}
     }
-    $showok= 0;
-    foreach $a (@{ $cfg->{'servers'} }) {
-	next if $addr_is_ok{$a};
-	zone_warning("we slave from $a"); $showok=1;
-    }
-    if ($showok) {
-	zone_warnmore("we must slave from one of ".
-		      join ' ', keys %addr_is_ok);
+}
+
+sub zone_servers_ok () {
+    my ($showok);
+    if (%addr_is_ok) {
+	$showok= 0;
+	foreach $a (@{ $cfg->{'servers'} }) {
+	    next if exists $addr_is_ok{$a};
+	    zone_warning("we slave from $a"); $showok=1;
+	}
+	if ($showok) {
+	    foreach $a (keys %addr_is_ok) {
+		zone_warnmore("permitted master [$a] $addr_is_ok{$a}");
+	    }
+	}
     }
 }
 
 sub zone_consistency_set ($%) {
     my ($msg,$set) = @_;
     my ($d,$o);
-    if (keys(%$set) != 1) {
+    if (keys(%$set) > 1) {
 	zone_warning("inconsistent $msg:");
 	foreach $d (keys %$set) {
-	    foreach $o (@$d) { zone_warnmore(" $d from $o"); }
+	    foreach $o (@{ $set->{$d} }) { zone_warnmore(" $d from $o"); }
 	}
     }
 }
 
-sub zone_check_soa ($$) {
-    my ($uaddr,$ww) = @_;
-    my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr);
-    $lame= 'dead or lame';
-    dig::dig({
-	if ($dig::type eq 'flags:') {
-	    $lame= $dig::rdata =~ m/ aa / ? 'lame' : '';
-	} elsif ($dig::type eq 'soa' && $dig::owner eq $zone && !$lame) {
-	    die "several SOAs ? $why" if defined $origin;
-	    $got= $dig::rdata;
-	    $got =~ m/^(\S+) \d+/ or die "$got ?";
-	    $origin= $1;
-	}
-    },
-	     $zone,'soa',$uaddr);
-    $lame= 'broken' if !$lame && !defined $origin;
-    if ($lame) { zone_warning("$lame server $ww"); return; }
-    push @{ $soas{$got} }, $why;
-    ($rcode,@soa_addrs)= lookup($origin,'a','0');
-    foreach $soa_addr (@soa_addrs) {
-	$addr_is_ok{$soa_addr}= 1;
-	push @to_check,
-	     $soa_addr,
-             "addr for $origin, SOA ORIGIN from $why";
-    }
+sub zone_check_local () {
+    zone_reset();
+    zone_servers_simplefind();
+    zone_servers_ok();
 }
 
-sub zone_check_nsrrset ($$$$) {
-    my ($uaddr,$ww, $delgs_or_auths,$glueless_ok) = @_;
-    my (@s, $s, %s2g, @glue, $glue);
-    dig::dig({
-	if ($dig::type eq 'ns' && $dig::owner eq $zone) {
-	    $s2g{lc $dig::rdata} = [ ];
-	} elsif ($dig::type eq 'a' && exists $s2g{$dig::owner}) {
-	    push @to_check,
-	         $dig::rdata,
-	         "glue for $dig::owner, from (eg) $why",
-	         \%auths, 0;
-	    $addr_is_ok{$dig::rdata}= 1 if $cfg->{'style'} eq 'stealth';
-	    push @{ $s2g{$dig::rdata} }, $dig::rdata;
-	}
-    },
-	     $zone,'ns',$uaddr);
-    @s= sort keys %s2g;
-    foreach $s (@s) {
-	@glue= @{ $s2g{$s} };
-	if (!length @glue) {
-	    zone_warning("glueless NS $s, from $ww") unless $glueless_ok;
-	    next;
-	}
-	$glue= join ' ', sort @glue;
-	push @{ $glue{$s}{$glue} }, $why;
+sub zone_servers_simplefind () {
+    my ($rcode,@nsnames,$ns,@soas,$origin);
+    if ($cfg->{'style'} eq 'stealth') {
+	($rcode,@nsnames)= lookup($zone,'ns-','0');
+	foreach $ns (@nsnames) { zone_server_simple($ns,'NS'); }
     }
-    $s= join ' ', @s;
-    push @{ $nsrrset_ref->{$s} }, $why;
+    ($rcode,@soas)= lookup($zone,'soa','0');
+    die "multiple SOA RRs in set!  @soas ?" if @soas!=1;
+    $soas[0] =~ m/^(\S+)\s/ or die "SOA ? $_";
+    zone_server_simple(domain_canon($1),'SOA');
 }
 
+sub zone_server_simple ($$) {
+    my ($name,$why) = @_;
+    my ($rcode,@addrs,$addr);
+    ($rcode,@addrs)= lookup($name,'a','0');
+    foreach $addr (@addrs) { $addr_is_ok{$addr}= "$name ($why)"; }
+}
 
 #-------------------- outputting
 
@@ -390,7 +472,7 @@ END
 
 sub debug_dump ($) {
     my ($vn);
-    return unless $debug;
+    return unless $debug>1;
     local $Data::Dumper::Terse=1;
     foreach $vn (split /\s+/, $_[0]) {
 	print "$vn := ", eval "Dumper(\\$vn)";
@@ -403,45 +485,49 @@ sub debug_trace ($) {
 }
 
 sub lookup ($$$) {
-    my ($type,$domain,$okrcodes) = @_;
-    my ($c,@result);
-    defined($c= open ADH, "-|") or die "$0: fork adnshost:\n $!\n";
+    my ($domain,$type,$okrcodes) = @_;
+    my ($c,$h,@result);
+    debug_trace("lookup ==> (->$okrcodes) $domain $type");
+    $h= new IO::Handle;
+
+    defined($c= open $h, "-|") or die "$quis: fork adnshost:\n $!\n";
     if (!$c) {
 	exec 'adnshost','-Fi','+Do','+Dt','+Dc','-Cf',"-t$type",
 	     '-',"$domain.";
-	die "$0: exec adnshost:\n $!\n";
+	die "$quis: exec adnshost:\n $!\n";
     }
-    @result= <ADH>;
+    @result= $h->getlines();
+    $h->error and die "$quis: read from adnshost:\n $!\n";
     chomp @result;
-    $!=0; close ADH;
-    die "$0: lookup -t$type $domain $okrcodes failed $? $!\n"
+    $!=0; $h->close;
+    die "$quis: lookup -t$type $domain $okrcodes failed $? $!\n"
 	if $! or $?>6 or index($okrcodes,$?)<0;
+    debug_trace("lookup <== $? @result");
     return ($?,@result);
 }
 
 
-package dig;
-
-use vars $owner, $type, $rdata;
-
 sub dig (&$$$) {
     my ($eachrr, $qowner,$qtype,$qaddr) = @_;
     # also pseudo-rr with type `flags:'
-    my ($h,$inmid);
+    my ($h,$inmid,$irdata,$c);
     local ($_);
 
+    debug_trace("dig ==> \@$qaddr $qowner $qtype");
+
     $h= new IO::Handle;
-    defined($c= open $h, "-|") or die "$0: fork dig:\n $!\n";
+    defined($c= open $h, "-|") or die "$quis: fork dig:\n $!\n";
     if (!$c) {
+	open STDERR, ">&STDOUT" or die $!;
 	exec ('dig',
 	      '+nodef','+nosea','+nodebug','+norecurse',
 	      "\@$qaddr",'-t',$qtype,$qowner);
-	die "$0: exec dig:\n $!\n";
+	die "$quis: exec dig:\n $!\n";
     }
     $inmid='';
     for (;;) {
 	if (!defined($_= $h->getline())) {
-	    $h->error() and die "$0: read from dig:\n $!\n";
+	    $h->error() and die "$quis: read from dig:\n $!\n";
 	    last;
 	}
 	chomp;
@@ -450,35 +536,46 @@ sub dig (&$$$) {
 	    s/\;.*$//;
 	    $_= $inmid.$_;
 	    $inmid='';
-	    s/$/ \(/ unless s/\s*\)$//;
+	    s/$/ \(/ unless s/\s*\)\s*$//;
 	}
-	if (s/\s*\($//) { $inmid= $_; next; }
+	if (s/\s*\(\s*$//) { $inmid= $_; next; }
 	if (m/^\;\; flags\:( [-0-9a-z ]+)\;/) {
-	    $owner=''; $type='flags:'; $rdata= "$1 ";
-	    { package main; &$dig::eachrr; };
+	    $dig_owner=''; $dig_type='flags:'; $dig_rdata= "$1 ";
+	    debug_trace("dig  f: $dig_rdata");
+	    &$eachrr;
 	} elsif (m/^\;/) {
 	} elsif (!m/\S/) {
-	} elsif (m/^([-.0-9a-z]+)\s+\d\w+\s+IN\s+([A-Z]+)\s+(\S.*)/) {
-	    $owner=$1; $type=$2; $rdata=$3;
-	    if ($type eq 'A') {
-		$rdata =~ m/^[.0-9]$/ or die;
-	    } elsif ($type eq 'NS') {
-		$rdata =~ m/^[-.0-9a-z]+$/ or die "bad nameserver $rdata ?";
-		$rdata= lc $rdata;
-	    } elsif ($type eq 'SOA') {
-		$rdata =~ m/^([-.0-9a-z]+)\s+.*\s+(\d+)(?:\s+\d\w+){4}$/
-		    or die "bad SOA $rdata ?";
-		$rdata= (lc $1).$2;
+	} elsif (m/^([-.0-9a-z]+)\s+\d\w+\s+in\s+([a-z]+)\s+(\S.*)/i) {
+	    $dig_owner=domain_canon($1); $dig_type=lc $2; $irdata=$3;
+	    if ($dig_type eq 'a') {
+		$irdata =~ m/^[.0-9]+$/ or die "$irdata ?";
+		$dig_rdata= $&;
+	    } elsif ($dig_type eq 'ns') {
+		$irdata =~ m/^[-.0-9a-z]+$/i or die "bad nameserver $irdata ?";
+		$dig_rdata= domain_canon($irdata);
+	    } elsif ($dig_type eq 'soa') {
+		$irdata =~ m/^([-.0-9a-z]+)\s+.*\s+(\d+)(?:\s+\d\w+){4}$/i
+		    or die "bad SOA $irdata ?";
+		$dig_rdata= domain_canon($1).' '.$2;
 	    } else {
-		debug_trace("ignoring uknown RR type $rtype");
+		debug_trace("ignoring uknown RR type $dig_type");
 		next;
 	    }
-	    { package mina; &$dig::eachrr; }
+	    debug_trace("dig  $dig_owner $dig_type $dig_rdata");
+	    &$eachrr;
 	} else {
 	    debug_trace("ignoring unknown dig output $_");
 	}
     }
-    $h->close or die $!;
+    $h->close;
+    debug_trace("dig <== gave $?");
+}
+
+sub domain_canon ($) {
+    local ($_) = @_;
+    s/(.)\.$/$1/;
+    die "domain $_ ?" unless m/^[0-9a-z]/i;
+    return lc $_;
 }
 
 __DATA__
@@ -489,7 +586,7 @@ __DATA__
 sub lookup1 ($$) {
     my ($type,$domain) = @_;
     my (@result)= lookup($type,$domain);
-    @result==1 or die "$0: lookup -t$type $domain gave more than one RR\n";
+    @result==1 or die "$quis: lookup -t$type $domain gave more than one RR\n";
     return $result[0];
 }
 
@@ -538,7 +635,7 @@ sub check () {
 	for $super_ns (@super_ns) {
 	    @deleg_ns= ();
 	    open DIG, "dig @$super_ns. -t ns +norecurse $zone."
-		or die "$0: fork for dig:\n $!\n";
+		or die "$quis: fork for dig:\n $!\n";
 	    while (<DIG>) {
 		
 
@@ -614,7 +711,7 @@ done
 endfile
 
     
-chdir "$base/primary" or die "$0: chdir $base/primary:\n $!";
+chdir "$base/primary" or die "$quis: chdir $base/primary:\n $!";
 beginfile('primary.zones');
 
 for $f (<*_db>) {
@@ -633,19 +730,19 @@ endfile
 sub beginfile ($) {
     $currentfile= $_[0];
     $currentfile_opened= $install ? "$conf/$currentfile.new" : "/dev/null";
-    open CFF, "> $toopen" or die "$0: begin $currentfile_opened:\n $!\n";
+    open CFF, "> $toopen" or die "$quis: begin $currentfile_opened:\n $!\n";
 }
 
 endfile () {
-    close CFF or die "$0: close $currentfile_opened:\n $!\n";
+    close CFF or die "$quis: close $currentfile_opened:\n $!\n";
     push @files, $currentfile;
 }
 
 sub installfiles () {
     return unless $install;
-    chdir $conf or die "$0: chdir $conf:\n $!\n";
+    chdir $conf or die "$quis: chdir $conf:\n $!\n";
     for $f (@files) {
-	rename "$f.new", $f or die "$0: install new $f:\n $!\n";
+	rename "$f.new", $f or die "$quis: install new $f:\n $!\n";
     }
 }