X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=scripts%2Fnamed-conf;h=24f99068e4ee1ee95835b2a660714955f52876e0;hp=3ea8d08fcf7ef613534fe2c8259d0d4d1b1ecaf7;hb=c0437873780b3bbd8ba98c5d5c4ecc5d7c688fce;hpb=0bfd000b8b4666a2104db802a0b3e24927b3ca25

diff --git a/scripts/named-conf b/scripts/named-conf
index 3ea8d08..24f9906 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -84,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= ();
@@ -113,17 +113,22 @@ 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,$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;
 	}
+	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/;
@@ -132,7 +137,7 @@ sub read_config ($) {
 	    @self_ns= @self if $1 ne '-soa';
 	    @self_soa= @self if $1 ne '-ns';
 	} elsif (m/^self\-addr\s+([0-9. \t]+)/) {
-	    @self_addr= split /\s+/, $2;
+	    @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;
@@ -145,15 +150,15 @@ 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/$_");
+		zone_conf($z,'primary','p',$mod,"$dir/$_");
 	    }
 	    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);
+	    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+)$/) {
@@ -176,8 +181,9 @@ sub qualify ($) {
     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) {
@@ -188,10 +194,13 @@ sub zone_conf ($$$@) {
     cfg_fail("redefined zone $zone") if exists $zone_cfg{$zone};
     $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;
 }
@@ -229,7 +238,7 @@ sub process_zones (@) {
 	    '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");
@@ -257,14 +266,15 @@ sub zone_warning ($) {
 }
 
 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(%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, ...)
 
@@ -276,7 +286,10 @@ sub zone_check_full () {
 }
 
 sub zone_reset() {
-    %delgs= %auths= %glue= %soas= %gluelesswarned= %addr_is_ok= ();
+    %delgs= %auths= %glue= %soas=
+	%warned_glueless= %warned_mynameaddr=
+	    %addr_is_ok= ();
+    $delg_to_us= 0;
     @to_check= @to_check_soa= ();
 }
 
@@ -315,7 +328,7 @@ sub zone_investigate() {
 			       $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;
 	}
@@ -324,17 +337,15 @@ sub zone_investigate() {
 
 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;
-	    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;
 	}
     },
@@ -349,7 +360,7 @@ sub zone_check_nsrrset ($$$$) {
 			 ($needglue<=1 ? " (eg)" : "").
 			 " from $ww")
 		unless $glueless_ok || !$needglue ||
-		       ($needglue<=1 && $gluelesswarned{$s}++);
+		       ($needglue<=1 && $warned_glueless{$s}++);
 	    next;
 	}
 	$glue= join ' ', sort @glue;
@@ -360,29 +371,34 @@ 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/;
+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 $ww)")
+		 " are published ($name $wwq)")
 	if $cfg->{'s'} =~ m/u/ && grep { $_ eq $addr } @self_addr;
 
-    $name_is_self= grep { $_ eq $name } ($is_soa ? @self_soa : @self_ns);
-    $addr_is_self= 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 has wrong address $addr ($ww)");
+	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" : "delegated to").
-		     " our address $addr but to wrong".
-		     " name $name ($ww)");
+	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) = @_;
-    my ($lame,$origin,$got,$rcode,@soa_addrs,$soa_addr);
-    verbose("checking service at $ww");
+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:') {
@@ -400,15 +416,14 @@ sub zone_check_soa ($$) {
     push @{ $soas{$got} }, $ww;
     ($rcode,@soa_addrs)= lookup($origin,'a','0');
     foreach $soa_addr (@soa_addrs) {
-	zone_server_addr($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, $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);
@@ -416,13 +431,14 @@ 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;
+	    zone_warning("SOA ORIGIN $origin is not our name (@$self_soa),".
+			 " eg from ".($soas{$org_ser}[0]));
 	}
     }
 }
@@ -441,6 +457,10 @@ sub zone_servers_ok () {
 	    }
 	}
     }
+    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 ($%) {
@@ -464,19 +484,19 @@ 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
@@ -527,7 +547,7 @@ 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"
+    die "$quis: lookup -t$type $domain $okrcodes failed $? $! @result\n"
 	if $! or $?>6 or index($okrcodes,$?)<0;
     debug_trace("lookup <== $? @result");
     return ($?,@result);