X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=scripts%2Fnamed-conf;h=694ab940adff6fdf84f0fa975127a2dd8d2beec5;hp=2dada625ab644d4539cd1add4816767bd2cd8cdf;hb=574e0861ea27316499473f567e15e5ddf82d5b0f;hpb=2c2ab9c756a7d1e9905c0ec442f6b9f2d714c697

diff --git a/scripts/named-conf b/scripts/named-conf
index 2dada62..694ab94 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -4,16 +4,21 @@ 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 $doall
+	    $etcfile $where
+	    $debug $needglue $localonly $verbosity);
+
+$quis= $0; $quis =~ s,.*/,,;
 
-use vars qw($mode $verbosity $debug $needglue $localonly);
 $mode= '';
-$verbosity= 1;
+$doall= 0;
+$etcfile= "/etc/bind/chiark-conf-gen.zones";
+$where= '<built-in>';
 $debug= 0;
-$needglue= 0;
+$needglue= 2;
 $localonly= 0;
+$verbosity= 1;
 
 use vars qw($dig_owner $dig_type $dig_rdata);
 
@@ -21,21 +26,26 @@ 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/^all$/) { $doall=1; }
 	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++; }
-	    elsif (s/^g//) { $needglue=0; }
+	    elsif (s/^A//) { $doall=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 -$&"); }
 	}
     }
@@ -44,6 +54,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;
 
@@ -72,8 +84,8 @@ $slave_dir= 'slave';
 $slave_prefix= '';
 $slave_suffix= '';
 
-use vars qw(@self_ns @self_soa);
-@self_ns= @self_soa= ();
+use vars qw(@self_ns @self_soa @self_addr);
+@self_ns= @self_soa= @self_addr= ();
 
 use vars qw(%zone_cfg @zone_cfg_list);
 %zone_cfg= ();
@@ -93,24 +105,29 @@ 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) = @_;
-    my ($fh,$z,@self, $dir,$prefix,$suffix,$lprefix,$lsuffix);
+    my ($fh,$z,@self, $mod,$dir,$prefix,$suffix,$lprefix,$lsuffix);
     local ($_);
 
     $fh= new IO::File $if,'r' or cfg_fail("open $if:\n $!");
+    $before= '';
     for (;;) {
 	if (!defined($_= <$fh>)) {
 	    cfg_fail("read config file $if:\n $!") if $fh->error();
 	    last;
 	}
-	$where= "$if:$.";
 	s/^\s+//; chomp; s/\s+$//;
+	if (m/\\$/) { $before.= $_; next; }
+	$_= $before.$_;
+	$before= '';
+	$where= "$if:$.";
 	next if m/^\#/;
 	last if m/^end$/;
 	next unless m/\S/;
@@ -118,28 +135,30 @@ 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+))?$/) {
-	    ($dir, $prefix, $suffix) = (qualify($1),$2,$3);
-	    $suffix= '_db' if !length $suffix;
+	} elsif (m/^self\-addr\s+([0-9. \t]+)/) {
+	    @self_addr= split /\s+/, $1;
+	} elsif (m/^primary\-dir([*?]?)\s+(\S+)((?:\s+(\S+))?:\s+(\S+))?$/) {
+	    ($mod, $dir, $prefix, $suffix) = ($1,qualify($2),$3,$4);
+	    $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;
 		next unless substr($_,length($_)-$lsuffix) eq $suffix;
 		$z= substr($_,$lprefix,length($_)-($lprefix+$lsuffix));
-		zone_conf($z,'primary',"$dir/$_");
+		zone_conf($z,'primary','p',$mod,"$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));
-	} elsif (m/^secondary\s+(\S+)\s+([0-9.\t]+)$/) {
-	    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/^primary([*?]?)\s+(\S+)\s+(\S+)$/) {
+	    zone_conf($2,'primary','p',$1,qualify($3));
+	} elsif (m/^published([*?]?)\s+(\S+)\s+([0-9.\t]+)$/) {
+	    zone_conf($2,'published','s',$1,'',$3);
+	} elsif (m/^stealth([*?]?)\s+(\S+)\s+([0-9. \t]+)$/) {
+	    zone_conf($2,'stealth','u',$1,'',split /\s+/, $3);
+	} 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")
@@ -158,10 +177,12 @@ sub read_config ($) {
 sub qualify ($) {
     my ($i) = @_;
     $i= "$default_dir/$i" unless $i =~ m,^/,;
+    return $i;
 }
 
-sub zone_conf ($$@) {
-    my ($zone,$style,$file,@servers) = @_;
+sub zone_conf ($$$$$@) {
+    my ($zone,$style,$sabbr,$mod,$file,@servers) = @_;
+    my ($sfx,$aref);
     $file= qualify("$slave_dir/$slave_prefix".$zone.$slave_suffix)
 	unless length $file;
     if (!length $output) {
@@ -171,10 +192,14 @@ sub zone_conf ($$@) {
     }
     cfg_fail("redefined zone $zone") if exists $zone_cfg{$zone};
     $zone_cfg{$zone}{'file'}= $file;
-    $zone_cfg{$zone}{'style'}= $style;
+    $zone_cfg{$zone}{'style_p'}= $style.$mod;
+    $zone_cfg{$zone}{'s'}= $sabbr.$mod; # p)rimary s)econdary u)npub f)oreign
     $zone_cfg{$zone}{'servers'}= [ @servers ];
-    $zone_cfg{$zone}{'self_soa'}= [ @self_soa ];
-    $zone_cfg{$zone}{'self_ns'}= [ @self_ns ];
+    foreach $sfx (qw(soa ns addr)) {
+	{ no strict 'refs'; $aref= [ @{ "self_$sfx" } ]; }
+	@$aref or cfg_fail("failed to specify self-$sfx before zone");
+	$zone_cfg{$zone}{"self_$sfx"}= $aref;
+    }
     $zone_cfg{$zone}{'output'}= $output;
     push @zone_cfg_list, $zone;
 }
@@ -207,16 +232,28 @@ sub process_zones (@) {
 
     foreach $zone (@zones) {
 	$cfg= $zone_cfg{$zone} || {
-	    'style' => 'foreign',
+	    'style_p' => 'foreign',
+	    's' => 'f',
 	    'servers' => [ ],
 	    };
-	progress(sprintf "%-40s %s", $zone, $$cfg{'style'});
-	if ($check) {
-	    eval { zone_check() };
+	progress(sprintf "%-40s %s", $zone, $$cfg{'style_p'});
+	if ($check && ($doall || $cfg->{'s'} !~ m/\?/)) {
+	    eval {
+		if ($localonly && $cfg->{'s'} =~ m/f/) {
+		    zone_warning("foreign zone specified with -l");
+		} elsif ($cfg->{'s'} =~ m/\*/ ||
+			 ($localonly && $cfg->{'s'} !~ m/p/)) {
+		    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 ($) {
@@ -235,18 +272,31 @@ 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(%addr_is_ok);
+use vars qw(%addr_is_ok %warned_glueless %warned_mynameaddr);
+use vars qw($delg_to_us);
 use vars qw(@to_check); # ($addr,$whyask,$is_auth,$glueless_ok, ...)
 use vars qw(@to_check_soa); # ($addr,$whyask, ...)
 
-sub zone_check () {
+sub zone_check_full () {
+    zone_reset();
+    zone_investigate();
+    zone_consistency();
+    zone_servers_ok();
+}
+
+sub zone_reset() {
+    %delgs= %auths= %glue= %soas=
+	%warned_glueless= %warned_mynameaddr=
+	    %addr_is_ok= ();
+    $delg_to_us= 0;
+    @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);
 
-    %delgs= %auths= %glue= %soas= %addr_is_ok= ();
-    @to_check= @to_check_soa= ();
-
     $super_zone= $zone;
     for (;;) {
 	debug_trace("zone $zone superzone $super_zone");
@@ -277,28 +327,24 @@ sub zone_check () {
 			       $is_auth, $glueless_ok);
 	} elsif (($addr,$wa,@to_check_soa) = @to_check_soa) {
 	    next if $soa_checked{$addr}++;
-	    zone_check_soa($addr,"[$addr] $wa");
+	    zone_check_soa($addr,"[$addr] $wa","[$addr] NS");
 	} else {
 	    last;
 	}
     }
-    zone_consistency();
 }
 
 sub zone_check_nsrrset ($$$$) {
     my ($uaddr,$ww, $is_auth, $glueless_ok) = @_;
-    my (@s, $s, %s2g, @glue, $glue, $delgs_or_auths);
+    my (@s, $s, %s2g, @glue, $glue, $delgs_or_auths, $wwn);
     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';
+	    $wwn= "in glue from $ww";
+	    push @to_check, $dig_rdata, "$dig_owner, $wwn", 1, 0;
+	    zone_server_addr($dig_rdata,$dig_owner,$wwn,"NS [$uaddr]",0);
 	    push @{ $s2g{$dig_owner} }, $dig_rdata;
 	}
     },
@@ -309,7 +355,11 @@ sub zone_check_nsrrset ($$$$) {
     foreach $s (@s) {
 	@glue= @{ $s2g{$s} };
 	if (!@glue) {
-	    zone_warning("glueless NS $s, from $ww") unless $glueless_ok;
+	    zone_warning("glueless NS $s,".
+			 ($needglue<=1 ? " (eg)" : "").
+			 " from $ww")
+		unless $glueless_ok || !$needglue ||
+		       ($needglue<=1 && $warned_glueless{$s}++);
 	    next;
 	}
 	$glue= join ' ', sort @glue;
@@ -320,10 +370,34 @@ sub zone_check_nsrrset ($$$$) {
     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");
+sub zone_server_addr ($$$$$) {
+    my ($addr,$name,$ww,$wwq,$is_soa) = @_;
+    $addr_is_ok{$addr}= "$name ($wwq)"
+	if $is_soa || $cfg->{'s'} =~ m/u/;
+    zone_warning("configured as stealth but we [$addr]".
+		 " are published ($name $wwq)")
+	if $cfg->{'s'} =~ m/u/ && grep { $_ eq $addr } @self_addr;
+
+    my ($name_is_self, $addr_is_self);
+    $name_is_self= grep { $_ eq $name }
+        @{ $cfg->{$is_soa ? 'self_soa' : 'self_ns'} };
+    $addr_is_self= grep { $_ eq $addr }
+        @{ $cfg->{'self_addr'} };
+    if ($name_is_self && !$addr_is_self) {
+	zone_warning("our name $name with wrong address [$addr], (eg) $ww")
+	    unless $warned_mynameaddr{$name}{$addr}++;
+    } elsif (!$name_is_self && $addr_is_self) {
+	zone_warning(($is_soa ? "SOA ORIGIN maps to" : "allegedly served by").
+		     " us [$addr] with wrong name $name, (eg) $ww")
+	    unless $warned_mynameaddr{$name}{$addr}++;
+    }
+    $delg_to_us=1 if $name_is_self;
+}
+
+sub zone_check_soa ($$$) {
+    my ($uaddr,$ww,$wwq) = @_;
+    my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr,$wwn);
+    verbose("checking service at $wwq");
     $lame= 'dead or lame';
     dig(sub {
 	if ($dig_type eq 'flags:') {
@@ -341,15 +415,14 @@ sub zone_check_soa ($$) {
     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";
+	$wwn= "SOA ORIGIN from $ww";
+	zone_server_addr($soa_addr,$origin,$wwn,"SOA [$uaddr]",1);
+	push @to_check, $soa_addr, "$origin, $wwn";
     }
 }
 
 sub zone_consistency() {
-    my ($d, $org_ser, $origin, $a, $showok, $h);
+    my ($d, $org_ser, $origin, $a, $h, $self_soa);
     zone_consistency_set('delegations',\%delgs);
     foreach $d (keys %delgs) { delete $auths{$d}; }
     zone_consistency_set('zone nameserver rrset',\%auths);
@@ -357,15 +430,20 @@ sub zone_consistency() {
 	zone_consistency_set("glue for $h", $glue{$h});
     }
     zone_consistency_set("SOA ORIGIN and SERIAL",\%soas);
-    if ($cfg->{'style'} eq 'primary') {
+    $self_soa= $cfg->{'self_soa'};
+    if ($cfg->{'s'} =~ m/p/) {
 	foreach $org_ser (keys %soas) {
 	    $org_ser =~ m/^(\S+) \d+$/ or die "$org_ser ?";
 	    $origin= $1;
-	    next if grep { $_ eq $origin } @self_soa;
-	    zone_warning("our name(s) @self_soa not in SOA ORIGIN $origin,".
-			 " eg from ".((values %{ $soas{$org_ser} })[1]));
+	    next if grep { $_ eq $origin } @$self_soa;
+	    zone_warning("SOA ORIGIN $origin is not our name (@$self_soa),".
+			 " eg from ".($soas{$org_ser}[0]));
 	}
     }
+}
+
+sub zone_servers_ok () {
+    my ($showok);
     if (%addr_is_ok) {
 	$showok= 0;
 	foreach $a (@{ $cfg->{'servers'} }) {
@@ -378,6 +456,10 @@ sub zone_consistency() {
 	    }
 	}
     }
+    if ($cfg->{'s'} =~ m/s/ && !$delg_to_us) {
+	zone_warnmore("we are supposedly published secondary,".
+		      " but not listed as a nameserver");
+    }
 }
 
 sub zone_consistency_set ($%) {
@@ -391,6 +473,30 @@ sub zone_consistency_set ($%) {
     }
 }
 
+sub zone_check_local () {
+    zone_reset();
+    zone_servers_simplefind();
+    zone_servers_ok();
+}
+
+sub zone_servers_simplefind () {
+    my ($rcode,@nsnames,$ns,@soas,$origin);
+
+    ($rcode,@nsnames)= lookup($zone,'ns-','0');
+    foreach $ns (@nsnames) { zone_server_simple($ns,'NS',0); }
+
+    ($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',1);
+}
+
+sub zone_server_simple ($$$) {
+    my ($name,$ww,$is_soa) = @_;
+    my ($rcode,@addrs,$addr);
+    ($rcode,@addrs)= lookup($name,'a','0');
+    foreach $addr (@addrs) { zone_server_addr($addr,$name,$ww,$ww,$is_soa); }
+}
 
 #-------------------- outputting
 
@@ -403,7 +509,7 @@ zone "%s" {
 };
 END
 		$zone,
-		$$cfg{'style'} eq 'primary' ? 'master' : 'slave',
+		$$cfg{'s'} =~ m/p/ ? 'master' : 'slave',
 		$$cfg{'file'});
 }
 
@@ -430,17 +536,17 @@ sub lookup ($$$) {
     debug_trace("lookup ==> (->$okrcodes) $domain $type");
     $h= new IO::Handle;
 
-    defined($c= open $h, "-|") or die "$0: fork adnshost:\n $!\n";
+    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= $h->getlines();
-    $h->error and die "$0: read from adnshost:\n $!\n";
+    $h->error and die "$quis: read from adnshost:\n $!\n";
     chomp @result;
     $!=0; $h->close;
-    die "$0: lookup -t$type $domain $okrcodes failed $? $!\n"
+    die "$quis: lookup -t$type $domain $okrcodes failed $? $!\n"
 	if $! or $?>6 or index($okrcodes,$?)<0;
     debug_trace("lookup <== $? @result");
     return ($?,@result);
@@ -456,18 +562,18 @@ sub dig (&$$$) {
     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;
@@ -514,216 +620,6 @@ sub dig (&$$$) {
 sub domain_canon ($) {
     local ($_) = @_;
     s/(.)\.$/$1/;
+    die "domain $_ ?" unless m/^[0-9a-z]/i;
     return lc $_;
 }
-
-__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";
-    return $result[0];
-}
-
-sub check () {
-    return unless $check;
-    eval {
-	$soa= lookup1('soa',$zone);
-	$soa_origin=$soa; $soa_origin =~ s/ .*//;
-	$soa_origin_addr= lookup1('a',$soa_origin);
-
-	@zone_ns= lookup('ns-',$zone);
-
-	@ok_sources= ($soa_origin_addr);
-	$ok_sources_descr= "SOA ORIGIN $soa_origin [$soa_origin_addr]";
-
-	if ($style eq 'unoff' || $style eq 'backup') {
-	    for $zone_ns (@zone_ns) {
-		@zone_ns_addrs= lookup('a',$zone_ns);
-		push @ok_sources, @zone_ns_addrs;
-		$ok_sources_descr.= ", NS $zone_ns [@zone_ns_addrs]";
-	    }
-	}
-
-	for $server (@servers) {
-	    grep { $server eq $_ } @ok_sources
-		or warn "secondarying from $server which is not ".
-		        "$ok_sources_desc\n";
-	}
-
-	if ($style eq 'secondary') {
-	    grep { $zone_ns=$_, grep { $myname eq $_ } @mynames } @zone_n
-		or warn "supposedly published secondary but we ".
-		        "(@mynames) are not published ($@zone_ns)\n";
-	}
-    }
-    check_after_eval();
-    
-
-			 
-#	$superzone= $zone; $superzone =~ s/^[^\.]+\.//;
-#	@super_ns= lookup('ns-',$zone);
-    }
-
-    eval {
-
-	for $super_ns (@super_ns) {
-	    @deleg_ns= ();
-	    open DIG, "dig @$super_ns. -t ns +norecurse $zone."
-		or die "$0: fork for dig:\n $!\n";
-	    while (<DIG>) {
-		
-
-	    split /\n/, lookup("
-	
-		case "$style" in
-		secondary|backup)
-			if [ $meadvert = 0 ]
-			then
-				warning "$myname unlisted NS $nsnames"
-			fi
-			;;
-		unoff)
-			if $meadvert = 0
-			then
-				warning "$myname advertised NS $nsnames"
-			fi
-			;;
-		esac
-
-		addrs=''
-		for ns in $names
-		do
-			set -e; a="`host -t a \"$ns\".`"; set +e
-			taddrs="`echo \" $a\" | expand | sed -n '
-				 1s/^ //
-				s/^[^ ][^ ]*  *A  *\([0-9][.0-9]*\)/\1/p
-			'`"
-			equlines "A $ns" "$a" "$taddrs"
-			addrs="$addrs $taddrs"
-		done
-	fi
-
-	cat <<END
-zone "$zone" {
-	type slave;
-	file "$file";
-	masters {
-END
-	for server in $servers
-	do
-		echo "		$server;"
-		if $check
-		then
-			notfound=1
-			for addr in $addrs
-			do
-				if [ "x$addr" = "x$server" ]
-				then
-					notfound=0
-				fi
-			done
-			if $notfound
-			then
- warning "server $server? but $rectype $names" $addrs
-			fi
-		fi
-	done
-	cat <<END
-	};
-};
-END
-	hostfirstwarn=1
-	if $hostdelg
-	then
-		checkhostout -C
-	fi
-	if $hostzone
-	then
-		checkhostout -val localhost
-	fi
-done
-endfile
-
-    
-chdir "$base/primary" or die "$0: chdir $base/primary:\n $!";
-beginfile('primary.zones');
-
-for $f (<*_db>) {
-    $zone= $f; $zone =~ s/_db$//;
-    
-
-for f in $zones
-do
-	zone="`echo $f | sed -e 's/_db$//'`"
-END
-done
-endfile
-
-
-    
-sub beginfile ($) {
-    $currentfile= $_[0];
-    $currentfile_opened= $install ? "$conf/$currentfile.new" : "/dev/null";
-    open CFF, "> $toopen" or die "$0: begin $currentfile_opened:\n $!\n";
-}
-
-endfile () {
-    close CFF or die "$0: close $currentfile_opened:\n $!\n";
-    push @files, $currentfile;
-}
-
-sub installfiles () {
-    return unless $install;
-    chdir $conf or die "$0: chdir $conf:\n $!\n";
-    for $f (@files) {
-	rename "$f.new", $f or die "$0: install new $f:\n $!\n";
-    }
-}
-
-warning () {
-	echo >&2 "$zone $style: $*"
-	warnings=$[$warnings+1]
-}
-
-equlines () {
-	if [ "x`echo \" $2\" | wc -l`" != "x`echo \" $3\" | wc -l`" ]
-	then
-		warning "$1 >$2|$3<"
-	fi
-}
-
-checkhostout () {
-	set +e
-	hostout="`host $1 \"$zone\" 2>&1 >/dev/null $2 | egrep -v \
-'^ \!\!\! .* SOA primary .* is not advertised via NS$'`"
-	set -e
-	if [ "x$hostout" = x ]; then return; fi
-	if $hostfirstwarn
-	then
-		warning "warnings from host:"
-		hostfirstwarn=0
-	fi
-	echo >&2 "$hostout"
-}
-
-progress () {
-	if $progress
-	then
-		echo -n "$zone $style                    " >&2
-		echo -ne '\r' >&2
-	fi
-}
-
-myname=''
-
-if [ $warnings != 0 ]
-then
-	echo >&2 "$warnings warnings                                        "
-fi
-
-installfiles