X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=scripts%2Fnamed-conf;h=378119183362b3c2c013fba3d172150866ef6e9d;hp=a222db0bab52ca5853035853abc89c1a606a3a2f;hb=861bcfb80879271bfd728b73277e15ffa86419ac;hpb=02b64fd81edc8a7cd109eb9cdecc41eb48501735

diff --git a/scripts/named-conf b/scripts/named-conf
index a222db0..3781191 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -3,11 +3,12 @@
 use strict;
 use IO::File;
 use Data::Dumper;
+use POSIX;
 
 use vars qw($quis
 	    $mode $doall
 	    $etcfile $where
-	    $debug $needglue $localonly $verbosity);
+	    $debug $needglue $localonly $repeat $verbosity);
 
 $quis= $0; $quis =~ s,.*/,,;
 
@@ -16,9 +17,10 @@ $doall= 0;
 $etcfile= "/etc/bind/chiark-conf-gen.zones";
 $where= '<built-in>';
 $debug= 0;
-$needglue= 2;
+$needglue= 1;
 $localonly= 0;
 $verbosity= 1;
+$repeat= 0;
 
 use vars qw($dig_owner $dig_type $dig_rdata);
 
@@ -29,9 +31,10 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) {
 	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/^glueless$/) { $needglue=0; }
 	elsif (m/^localonly$/) { $localonly=1; }
 	elsif (m/^quiet$/) { $verbosity=0; }
+	elsif (m/^repeat$/) { $repeat=1; }
 	elsif (m/^verbose$/) { $verbosity=2; }
 	else { usageerr("unknown option --$_"); }
     } else {
@@ -42,9 +45,10 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) {
 	    elsif (s/^A//) { $doall=1; }
 	    elsif (s/^C//) { $etcfile= soarg(); $where= '-C option'; }
 	    elsif (s/^D//) { $debug++; }
-	    elsif (s/^g//) { $needglue--; }
+	    elsif (s/^g//) { $needglue=0; }
 	    elsif (s/^l//) { $localonly=1; }
 	    elsif (s/^q//) { $verbosity=0; }
+	    elsif (s/^r//) { $repeat=1; }
 	    elsif (s/^v//) { $verbosity=2; }
 	    else { usageerr("unknown option -$&"); }
 	}
@@ -54,7 +58,6 @@ 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;
@@ -62,30 +65,35 @@ usageerr("must specify either -f|-y|-n or zones (and not both)")
 sub usageerr ($) {
     die
 "$_[0]
-usage: named-conf-regen [-rvq] -f|-y|-n|<zone>...\n".
+usage: named-conf-regen [options] -f|-y|-n|<zone>...\n".
 "operation modes:\n".
 " -f --force   install without checking\n".
 " -y --yes     check and install\n".
 " -n --no      check only\n".
 "additional options:\n".
-" -q --quiet   no output for OK zones\n".
-" -v --verbose extra verbose\n";
+" -A --all       report on zones marked ? (ones we know are broken)\n".
+" -D             debug $quis (does not help debug your DNS config)\n".
+" -g --glueless  do not warn about any glueless referrals (not recommended)\n".
+" -l --localonly full checks only on zones which we primary\n".
+" -q --quiet     no output for OK zones\n".
+" -r --repeat    repeat warnings for all sources of imperfect data\n".
+" -v --verbose   extra verbose info about each zone\n".
+" -C|--config <DIR/FILE  use FILE as default config and DIR as default dir\n";
 }
 
-cfg_fail("config filename $etcfile should have been absolute path of a file")
-    unless $etcfile =~ m,^/, && $etcfile !~ m,/$,;
+cfg_fail("config filename $etcfile should not be directory")
+    if $etcfile =~ m,/$,;
 
 use vars qw($default_dir);
-$default_dir= $etcfile;
-$default_dir =~ s,/[^/]+$,,;
+$default_dir= $etcfile =~ m,^.*/, ? $& : './';
 
 use vars qw($slave_dir $slave_prefix $slave_suffix);
 $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 @forbid_addr @conv_glueless);
+@self_ns= @self_soa= @self_addr= @forbid_addr= @conv_glueless= ();
 
 use vars qw(%zone_cfg @zone_cfg_list);
 %zone_cfg= ();
@@ -104,6 +112,7 @@ read_config($etcfile);
 debug_dump('@zone_cfg_list %zone_cfg');
 process_zones($mode ? @zone_cfg_list : @ARGV);
 debug_dump('%output_contents');
+output_files() if $install;
 
 exit 0;
 
@@ -113,17 +122,23 @@ 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,$before,
+	$mod,$dir,$prefix,$suffix,$subfile,$lprefix,$lsuffix,$zf);
     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;
 	}
+	chomp; s/\s+$//;
+	if (m/\\$/) { $before.= $_; next; }
+	$_= $before.$_;
+	$before= '';
+	s/^\s+//;
 	$where= "$if:$.";
-	s/^\s+//; chomp; s/\s+$//;
 	next if m/^\#/;
 	last if m/^end$/;
 	next unless m/\S/;
@@ -131,12 +146,24 @@ sub read_config ($) {
 	    @self= split /\s+/, $2;
 	    @self_ns= @self if $1 ne '-soa';
 	    @self_soa= @self if $1 ne '-ns';
+	} elsif (m/^serverless\-glueless\s+(\S.*\S)/) {
+	    @conv_glueless= split /\s+/, $1;
 	} elsif (m/^self\-addr\s+([0-9. \t]+)/) {
-	    @self_addr= split /\s+/, $2;
-	} 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;
+	    @self_addr= split /\s+/, $1;
+	} elsif (m/^forbid\-addr(?:\s+([0-9. \t]+))?/) {
+	    @forbid_addr= defined $1 ? split /\s+/, $1 : ();
+	} elsif (m,^
+		 primary\-dir ([*?]?)
+		 \s+ (\S+)/([^/ \t]*)
+		 (?: \s+ ([^/ \t]*) (?: (/.+) )?
+		  )?
+		 $,x) {
+	    ($mod, $dir, $prefix, $suffix, $subfile) =
+		($1,qualify($2),$3,$4,$5);
+	    $suffix= '' if !defined $suffix;
+	    $subfile= '' if !defined $subfile;
+	    $suffix= '_db' if !length $suffix && !length $subfile;
+	    if (-d "$dir/$prefix") { $dir.='/'; $dir.=$prefix; $prefix=''; }
 	    opendir D, $dir or cfg_fail("open primary-dir $dir:\n $!");
 	    $lprefix= length $prefix; $lsuffix= length $suffix;
 	    while (defined($_= readdir D)) {
@@ -145,17 +172,25 @@ sub read_config ($) {
 		next unless substr($_,0,$lprefix) eq $prefix;
 		next unless substr($_,length($_)-$lsuffix) eq $suffix;
 		$z= substr($_,$lprefix,length($_)-($lprefix+$lsuffix));
-		zone_conf($z,'primary',"p$mod","$dir/$_");
+		$zf= $dir.'/'.$prefix.$z.$suffix.$subfile;
+		if (!stat $zf) {
+		    next if length $subfile && $! == &ENOENT;
+		    cfg_fail("cannot stat zonefile $zf:\n $!");
+		}
+		-f _ or cfg_fail("zonefile $zf is not a plain file");
+		zone_conf($z,'primary','p',$mod,$zf);
 	    }
 	    closedir D or cfg_fail("close primary-dir $dir:\n $!");
 	} elsif (m/^primary([*?]?)\s+(\S+)\s+(\S+)$/) {
-	    zone_conf($2,'primary',"p$1",qualify($3));
+	    zone_conf($2,'primary','p',$1,qualify($3));
 	} elsif (m/^published([*?]?)\s+(\S+)\s+([0-9.\t]+)$/) {
-	    zone_conf($2,'published',"s$1",'',$3);
+	    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+))?$/) {
+	    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);
+	    $slave_prefix='' if !defined $slave_prefix;
+	    $slave_suffix='' if !defined $slave_suffix;
 	} elsif (m/^output\s+bind8\+(\S+)$/) {
 	    cfg_fail("default output may not apply to only some zones")
 		if @zone_cfg_list && length $default_output;
@@ -172,12 +207,13 @@ sub read_config ($) {
 
 sub qualify ($) {
     my ($i) = @_;
-    $i= "$default_dir/$i" unless $i =~ m,^/,;
+    $i= "$default_dir$i" unless $i =~ m,^/,;
     return $i;
 }
 
-sub zone_conf ($$$@) {
-    my ($zone,$style,$s,$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) {
@@ -185,13 +221,19 @@ sub zone_conf ($$$@) {
 	    unless length $default_output;
 	set_output($default_output);
     }
-    cfg_fail("redefined zone $zone") if exists $zone_cfg{$zone};
+    cfg_fail("redefined zone $zone\n".
+	     " earlier definition $zone_cfg{$zone}{'where'}")
+	if exists $zone_cfg{$zone};
+    $zone_cfg{$zone}{'where'}= $where;
     $zone_cfg{$zone}{'file'}= $file;
     $zone_cfg{$zone}{'style_p'}= $style.$mod;
-    $zone_cfg{$zone}{'s'}= $s; # p)rimary s)econdary u)npublished f)oreign
+    $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;
 }
@@ -223,16 +265,17 @@ sub process_zones (@) {
     local ($zone,$cfg);
 
     foreach $zone (@zones) {
+	zone_reset();
 	$cfg= $zone_cfg{$zone} || {
 	    'style_p' => 'foreign',
 	    's' => 'f',
 	    'servers' => [ ],
 	    };
 	progress(sprintf "%-40s %s", $zone, $$cfg{'style_p'});
-	if ($check && ($doall || $cfg{'s'} !~ m/\?/)) {
+	if ($check && ($doall || $cfg->{'s'} !~ m/\?/)) {
 	    eval {
 		if ($localonly && $cfg->{'s'} =~ m/f/) {
-		    zone_warning("foreign zone specified with -l");
+		    zone_warning("foreign zone specified with -l",'');
 		} elsif ($cfg->{'s'} =~ m/\*/ ||
 			 ($localonly && $cfg->{'s'} !~ m/p/)) {
 		    zone_check_local();
@@ -240,43 +283,53 @@ sub process_zones (@) {
 		    zone_check_full();
 		}
 	    };
-	    zone_warning("checks failed: $@") if length $@;
+	    zone_warning("checks failed: $@",'') if length $@;
 	}
-	zone_output() if $install;
+	$output_contents{$$cfg{'output'}} .= zone_output()
+	    if $install;
     }
     print STDERR "$quis: $warnings warnings\n" or die $!
 	if $warnings;
 }
 
-sub zone_warning ($) {
-    my ($w) = @_;
+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 %warned);
+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_warning ($$) {
+    my ($w,$o) = @_;
+    my ($wk);
+
+    $wk= $w;
+    $wk =~ s/,.*// if !$repeat;
+    return 0 if $warned{$w}{$wk}++;
+
     $w =~ s/\n$//;
     $w =~ s,\n, // ,g;
+
     print STDERR "$zone: warning: $w\n" or die $!;
     $warnings++;
+    return 1;
 }
 
 sub zone_warnmore ($) {
-    print STDERR " $_[0]\n" or die $!;
+    print STDERR "$zone:  $_[0]\n" or die $!;
 }
 
-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 %gluelesswarned);
-use vars qw(@to_check); # ($addr,$whyask,$is_auth,$glueless_ok, ...)
-use vars qw(@to_check_soa); # ($addr,$whyask, ...)
-
 sub zone_check_full () {
-    zone_reset();
     zone_investigate();
     zone_consistency();
     zone_servers_ok();
 }
 
 sub zone_reset() {
-    %delgs= %auths= %glue= %soas= %gluelesswarned= %addr_is_ok= ();
+    %delgs= %auths= %glue= %soas= %warned= %addr_is_ok= ();
+    $delg_to_us= 0;
     @to_check= @to_check_soa= ();
 }
 
@@ -311,11 +364,10 @@ sub zone_investigate() {
 	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);
+	    zone_check_nsrrset($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");
+	    zone_check_soa($addr, $wa, "NS [$addr]");
 	} else {
 	    last;
 	}
@@ -323,33 +375,35 @@ sub zone_investigate() {
 }
 
 sub zone_check_nsrrset ($$$$) {
-    my ($uaddr,$ww, $is_auth, $glueless_ok) = @_;
-    my (@s, $s, %s2g, @glue, $glue, $delgs_or_auths);
+    my ($uaddr,$wa, $is_auth, $glueless_ok) = @_;
+    my (@s, $s, %s2g, @glue, $glue, $delgs_or_auths, $wwn, $ww);
     verbose("checking delegation by $ww");
+    $ww= "[$uaddr] $wa";
     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;
-	    zone_server_addr($dig_rdata,$dig_owner,"NS [$uaddr]");
+	    $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;
 	}
     },
 	     $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"); }
+    if (!%s2g) {
+	zone_warning("unable to find NS RRset at [$uaddr]", $wa);
+	return;
+    } elsif (keys %s2g == 1) {
+	zone_warning("only one nameserver",$ww);
+    }
     @s= sort keys %s2g;
     foreach $s (@s) {
 	@glue= @{ $s2g{$s} };
 	if (!@glue) {
-	    zone_warning("glueless NS $s,".
-			 ($needglue<=1 ? " (eg)" : "").
-			 " from $ww")
+	    zone_warning("glueless NS $s,".($needglue<=1 ? " (eg)" : ""),
+			 $ww)
 		unless $glueless_ok || !$needglue ||
-		       ($needglue<=1 && $gluelesswarned{$s}++);
+		       grep { has_suffix_of($s,".$_"); } @conv_glueless;
 	    next;
 	}
 	$glue= join ' ', sort @glue;
@@ -360,20 +414,44 @@ sub zone_check_nsrrset ($$$$) {
     push @{ $delgs_or_auths->{$s} }, $ww;
 }
 
-sub zone_server_addr ($$$$) {
-    my ($addr,$name,$ww,$is_soa) = @_;
-    $addr_is_ok{$addr}= "$name ($ww)"
-	if $is_soa || $cfg{'s'} =~ m/u/;
-    zone_warning("configured as stealth but we [$addr]".
-		 " are published ($name $ww)")
+sub zone_server_addr ($$$$$) {
+    my ($addr,$name,$ww,$wwq,$is_soa) = @_;
+    my ($cg);
+    $addr_is_ok{$addr}= "$name ($wwq)"
+	if $is_soa || $cfg->{'s'} =~ m/u/;
+    foreach $cg (@conv_glueless) {
+	next unless has_suffix_of(".$name",".$cg");
+	zone_warning("nameserver [$addr] $name in serverless-glueless".
+		     " namespace area $cg",
+		     $ww);
+    }
+    zone_warning("configured as stealth but we [$addr] $name are published",
+		 $ww)
 	if $cfg->{'s'} =~ m/u/ && grep { $_ eq $addr } @self_addr;
+    zone_warning("forbidden nameserver address [$addr] $name",$ww)
+	if grep { $_ eq $addr } @forbid_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]",$ww);
+    } elsif (!$name_is_self && $addr_is_self) {
+	zone_warning(($is_soa ? "SOA ORIGIN maps to" : "referral to").
+		     " us [$addr] with wrong name $name",
+		     $ww);
+    }
+    $delg_to_us=1 if $name_is_self;
 }
 
-sub zone_check_soa ($$) {
-    my ($uaddr,$ww) = @_;
-    my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr);
-    verbose("checking service at $ww");
+sub zone_check_soa ($$$) {
+    my ($uaddr,$wa,$waq) = @_;
+    my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr,$ww,$wwn);
+    verbose("checking service at [$uaddr] $waq");
     $lame= 'dead or lame';
+    $ww= "[$uaddr] $wa";
     dig(sub {
 	if ($dig_type eq 'flags:') {
 	    $lame= $dig_rdata =~ m/ aa / ? '' : 'lame';
@@ -386,19 +464,18 @@ sub zone_check_soa ($$) {
     },
 	     $zone,'soa',$uaddr);
     $lame= 'broken' if !$lame && !defined $origin;
-    if ($lame) { zone_warning("$lame server $ww"); return; }
+    if ($lame) { zone_warning("$lame server [$uaddr]",$wa); return; }
     push @{ $soas{$got} }, $ww;
     ($rcode,@soa_addrs)= lookup($origin,'a','0');
+    $wwn= "SOA ORIGIN from $ww";
     foreach $soa_addr (@soa_addrs) {
-	zone_server_addr($addr,$origin,"SOA [$uaddr]"
-	push @to_check,
-	     $soa_addr,
-             "$origin, 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, $h);
+    my ($d, $org_ser, $origin, $a, $h, $self_soa, $wa);
     zone_consistency_set('delegations',\%delgs);
     foreach $d (keys %delgs) { delete $auths{$d}; }
     zone_consistency_set('zone nameserver rrset',\%auths);
@@ -406,13 +483,16 @@ sub zone_consistency() {
 	zone_consistency_set("glue for $h", $glue{$h});
     }
     zone_consistency_set("SOA ORIGIN and SERIAL",\%soas);
+    $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 (@self_soa) not in SOA ORIGIN $origin,".
-			 " eg from ".((values %{ $soas{$org_ser} })[1]));
+	    next if grep { $_ eq $origin } @$self_soa;
+	    foreach $wa (@{ $soas{$org_ser} }) {
+		zone_warning("SOA ORIGIN $origin is not our name (@$self_soa)",
+			     $wa);
+	    }
 	}
     }
 }
@@ -423,7 +503,8 @@ sub zone_servers_ok () {
 	$showok= 0;
 	foreach $a (@{ $cfg->{'servers'} }) {
 	    next if exists $addr_is_ok{$a};
-	    zone_warning("we slave from $a"); $showok=1;
+	    zone_warning("we slave from [$a]",'')
+		and $showok=1;
 	}
 	if ($showok) {
 	    foreach $a (keys %addr_is_ok) {
@@ -431,13 +512,17 @@ sub zone_servers_ok () {
 	    }
 	}
     }
+    if ($cfg->{'s'} =~ m/s/ && !$delg_to_us) {
+	zone_warning("we are supposedly published secondary,".
+		     " but not listed as a nameserver",'');
+    }
 }
 
 sub zone_consistency_set ($%) {
     my ($msg,$set) = @_;
     my ($d,$o);
     if (keys(%$set) > 1) {
-	zone_warning("inconsistent $msg:");
+	zone_warning("inconsistent $msg:",'');
 	foreach $d (keys %$set) {
 	    foreach $o (@{ $set->{$d} }) { zone_warnmore(" $d from $o"); }
 	}
@@ -445,7 +530,6 @@ sub zone_consistency_set ($%) {
 }
 
 sub zone_check_local () {
-    zone_reset();
     zone_servers_simplefind();
     zone_servers_ok();
 }
@@ -454,36 +538,82 @@ sub zone_servers_simplefind () {
     my ($rcode,@nsnames,$ns,@soas,$origin);
 
     ($rcode,@nsnames)= lookup($zone,'ns-','0');
-    foreach $ns (@nsnames) { zone_server_simple($ns,'NS'); }
+    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');
+    zone_server_simple(domain_canon($1),'SOA',1);
 }
 
-sub zone_server_simple ($$) {
-    my ($name,$why) = @_;
+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,$why); }
+    foreach $addr (@addrs) { zone_server_addr($addr,$name,$ww,$ww,$is_soa); }
 }
 
 #-------------------- outputting
 
 sub zone_output () {
-    $output_contents{$$cfg{'output'}}.=
-	sprintf(<<'END',
-zone "%s" {
-    type %s;
-    file "%s";
-};
-END
-		$zone,
-		$$cfg{'s'} =~ m/p/ ? 'master' : 'slave',
-		$$cfg{'file'});
+    my ($o,$m);
+
+    $o= "zone \"$zone\" {\n";
+    if ($$cfg{'s'} =~ m/p/) {
+	$o.= "    type master;\n";
+    } else {
+	$o.= "    type slave;\n".
+	     "    masters {\n";
+	foreach $m (@{ $$cfg{'servers'} }) { $o.= "        $m;\n"; }
+	$o.= "    };\n";
+    }
+    $o.= "    file \"$$cfg{'file'}\";\n";
+    $o.= "};\n";
+    return $o;
 }
 
+sub output_files () {
+    my ($fn,$ofn,$mfn,$l,$dir, $maxmode,$h,@to_install);
+    
+    foreach $ofn (keys %output_contents) {
+	$fn= $ofn; $mfn= "output file $fn";
+	for (;;) {
+	    if (!lstat $fn) {
+		$! == &ENOENT or die "$quis: stat $mfn:\n $!\n";
+		$maxmode= 0666;
+		last;
+	    } elsif (-f _) {
+		$maxmode= (stat _)[2];
+		last;
+	    } elsif (-l _) {
+		defined($l= readlink $fn)
+		    or die "$quis: readlink $mfn:\n $!\n";
+		$dir= $fn =~ m,^.*/, ? $& : './';
+		$fn= "$dir$l" unless $l =~ m,^/,;
+		$mfn= "output file $fn (symlink target of $ofn)";
+	    } else {
+		die "$quis: output file $mfn exists but is not a file".
+		    " (or symlink to one)";
+	    }
+	}
+	unlink "$fn.new" or $! == &ENOENT or
+	    die "$quis: cannot clear out old .new version of $mfn:\n $!";
+	$h= new IO::File "$fn.new",'w',$maxmode
+	    or die("$quis: create .new version of $mfn:\n $!");
+	print $h
+	    "# generated by $quis, do not edit\n",
+	    $output_contents{$ofn}
+	    or die "$quis: write data to .new version of $mfn:\n $!";
+        $h->close
+	    or die "$quis: close .new version of $mfn:\n $!";
+	push @to_install, $fn,$mfn;
+    }
+
+    while (($fn,$mfn, @to_install) = @to_install) {
+	rename "$fn.new",$fn
+	    or die "$quis: install new version of $mfn:\n $!";
+    }
+}
 
 #-------------------- general utilities
 
@@ -501,6 +631,13 @@ sub debug_trace ($) {
     print "D $_[0]\n";
 }
 
+sub has_suffix_of ($$) {
+    my ($whole,$suffix);
+    return 0 if length $whole < length $suffix;
+    return 0 if substr($whole, length($whole) - length($suffix)) ne $suffix;
+    return 1;
+}
+
 sub lookup ($$$) {
     my ($domain,$type,$okrcodes) = @_;
     my ($c,$h,@result);
@@ -517,8 +654,8 @@ sub lookup ($$$) {
     $h->error and die "$quis: read from adnshost:\n $!\n";
     chomp @result;
     $!=0; $h->close;
-    die "$quis: lookup -t$type $domain $okrcodes failed $? $!\n"
-	if $! or $?>6 or index($okrcodes,$?)<0;
+    die "$quis: lookup -t$type $domain $okrcodes failed $? $! @result\n"
+	if $! or $?&255 or $?>1536 or index($okrcodes,$?>>8)<0;
     debug_trace("lookup <== $? @result");
     return ($?,@result);
 }