X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=scripts%2Fnamed-conf;h=120f2b7a78f0fd1bbce7aea63bc3485c50384a88;hp=50b7945fb67965fa406df33cd5622322799c4198;hb=2d961637e0e206ca3afae36a68996750fcabfa67;hpb=6570759829a7b59f425d9a5f47bc55b7ec303231

diff --git a/scripts/named-conf b/scripts/named-conf
index 50b7945..120f2b7 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -1,4 +1,19 @@
 #!/usr/bin/perl -w
+# This is chiark-named-conf, which is Copyright 2002 Ian Jackson.
+#
+# chiark-named-conf and its manpage are free software; you can
+# redistribute it and/or modify them under the terms of the GNU
+# General Public License as published by the Free Software Foundation;
+# either version 3, or (at your option) any later version.
+# 
+# chiark-named-conf and its manpage are distributed in the hope that
+# it will be useful, but WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 use strict;
 use IO::File;
@@ -6,6 +21,50 @@ use Data::Dumper;
 use POSIX;
 use Fcntl qw(:DEFAULT :flock);
 
+# bastard Perl wants me to do this now !
+sub loarg();
+sub soarg();
+sub usageerr ($);
+sub cfg_fail ($);
+sub read_config ($);
+sub qualify ($);
+sub bad_modifiers ($);
+sub zone_conf ($$$$$@);
+sub set_output($);
+sub progress ($$);
+sub verbose ($);
+sub process_zones (@);
+sub zone_warning ($$);
+sub zone_warnmore ($);
+sub zone_check_full ();
+sub zone_reset();
+sub zone_investigate();
+sub zone_check_nsrrset ($$$$);
+sub zone_ns_name ($$);
+sub zone_server_queue ($$$$$);
+sub zone_server_addr ($$$$$);
+sub zone_check_soa ($$$$);
+sub zone_consistency();
+sub zone_servers_ok ();
+sub zone_consistency_set ($%);
+sub zone_check_local ();
+sub zone_servers_simplefind ();
+sub zone_server_simple ($$$);
+sub zone_style ($$);
+sub mail_zone_before ();
+sub mail_zone_after ();
+sub pmail ($);
+sub ptime ($);
+sub mail_zone_mail ();
+sub zone_output ();
+sub output_files ();
+sub debug_dump ($);
+sub debug_trace ($);
+sub has_suffix_of ($$);
+sub lookup ($$$$);
+sub dig (&$$$);
+sub domain_canon ($$);
+
 use vars qw($quis $stdout_fh $stderr_fh
 	    $mode $doall $domail
 	    $etcfile $where
@@ -14,6 +73,7 @@ use vars qw($quis $stdout_fh $stderr_fh
 	    $progress_fh $warn_fh $modifiers
 	    %group2modcmd %group2used);
 
+$|=1;
 $quis= $0; $quis =~ s,.*/,,;
 
 $mode= '';
@@ -28,7 +88,7 @@ $admin=''; $mail_state_dir=''; $mail_max_warnfreq= 50;
 $repeat= 0;
 $domail= '';
 $modifiers= '';
-$group2modcmd{'foreign'}= '*$!@?';
+$group2modcmd{'foreign'}= '$!*@?';
 $group2used{'foreign'}= 1;
 
 ($progress_fh= $stdout_fh= new_from_fd IO::Handle(1,'w') and
@@ -126,8 +186,9 @@ $slave_dir= 'slave';
 $slave_prefix= '';
 $slave_suffix= '';
 
-use vars qw(@self_ns @self_soa @self_addr @forbid_addr @conv_glueless);
-@self_ns= @self_soa= @self_addr= @forbid_addr= ();
+use vars qw(@self_ns @self_soa @self_addr @forbid_addr @forbid_slave
+	    @conv_glueless @indirect_glue);
+@self_ns= @self_soa= @self_addr= @forbid_addr= @forbid_slave= @indirect_glue= ();
 @conv_glueless= qw(in-addr.arpa ip6.arpa ip6.int);
 
 use vars qw(%zone_cfg @zone_cfg_list);
@@ -145,7 +206,7 @@ $install= $mode =~ m/^[yf]/;
 
 read_config($etcfile);
 debug_dump('@zone_cfg_list %zone_cfg');
-process_zones($mode && !$domail ? @zone_cfg_list : @ARGV);
+process_zones(!@ARGV ? @zone_cfg_list : @ARGV);
 debug_dump('%output_contents');
 output_files() if $install;
 
@@ -163,7 +224,11 @@ sub read_config ($) {
 	$mod,$dir,$prefix,$suffix,$subfile,$lprefix,$lsuffix,$zf);
     local ($_);
 
-    $fh= new IO::File $if,'r' or cfg_fail("open $if:\n $!");
+    $fh= new IO::File $if,'r';
+    unless ($fh) {
+	return if $! == &ENOENT;
+	cfg_fail("open $if:\n $!");
+    }
     $before= '';
     for (;;) {
 	if (!defined($_= <$fh>)) {
@@ -185,10 +250,14 @@ sub read_config ($) {
 	    @self_soa= @self if $1 ne '-ns';
 	} elsif (m/^serverless\-glueless\s+(\S.*\S)/) {
 	    @conv_glueless= split /\s+/, $1;
+	} elsif (m/^allow\-indirect\-glue\s+(\S.*\S)/) {
+	    @indirect_glue= split /\s+/, $1;
 	} elsif (m/^self\-addr\s+([0-9. \t]+)/) {
 	    @self_addr= split /\s+/, $1;
 	} elsif (m/^forbid\-addr(?:\s+([0-9. \t]+))?/) {
 	    @forbid_addr= defined $1 ? split /\s+/, $1 : ();
+	} elsif (m/^forbid\-slave(?:\s+([0-9. \t]+))?/) {
+	    @forbid_slave= defined $1 ? split /\s+/, $1 : ();
 	} elsif (m,^
 		 primary\-dir (\W*)
 		 \s+ (\S+)/([^/ \t]*)
@@ -285,9 +354,23 @@ sub bad_modifiers ($) {
     return 0;
 }
 
+sub zone_conf_settings ($$) {
+    my ($cfg,$zone) = @_;
+    my ($sfx,$aref);
+    foreach $sfx (qw(self_soa self_ns self_addr forbid_addr forbid_slave
+		     conv_glueless indirect_glue)) {
+	{ no strict 'refs'; $aref= [ @$sfx ]; }
+	@$aref or cfg_fail("failed to specify $sfx before zone")
+	    if $sfx =~ m/^self/;
+	$cfg->{$sfx}= $aref;
+    }
+    foreach $sfx (qw(self_soa self_ns)) {
+	map { s/\*$/$zone/ } @{ $zone_cfg{$zone}{$sfx} };
+    }
+}
+
 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) {
@@ -313,15 +396,7 @@ sub zone_conf ($$$$$@) {
 	$zone_cfg{$zone}{'maildir'}= qualify($mail_state_dir);
 	$zone_cfg{$zone}{'mailmwarn'}= $mail_max_warnfreq;
     }
-    foreach $sfx (qw(self_soa self_ns self_addr forbid_addr conv_glueless)) {
-	{ no strict 'refs'; $aref= [ @$sfx ]; }
-	@$aref or cfg_fail("failed to specify $sfx before zone")
-	    if $sfx =~ m/^self/;
-	$zone_cfg{$zone}{$sfx}= $aref;
-    }
-    foreach $sfx (qw(self_soa self_ns)) {
-	map { s/\*$/$zone/ } @{ $zone_cfg{$zone}{$sfx} };
-    }
+    zone_conf_settings($zone_cfg{$zone}, $zone);
     $zone_cfg{$zone}{'output'}= $output;
     push @zone_cfg_list, $zone;
 }
@@ -350,11 +425,20 @@ sub process_zones (@) {
     local ($zone,$cfg);
 
     foreach $zone (@zones) {
-	$cfg= $zone_cfg{$zone} || {
-	    'style_p' => 'foreign',
-	    's' => "f $group2modcmd{'foreign'}",
-	    'servers' => [ ],
+	if ($zone =~ m/\.$/) {
+	    zone_warning("zone specified with trailing dot -".
+			 " will not work", '');
+	}
+
+	$cfg= $zone_cfg{$zone};
+	if (!$cfg) {
+	    $cfg= {
+		'style_p' => 'foreign',
+		's' => "f $group2modcmd{'foreign'}",
+		'servers' => [ ],
 	    };
+	    zone_conf_settings($cfg, $zone);
+	}
 
 	mail_zone_before() or next
 	    if $domail;
@@ -393,7 +477,7 @@ sub process_zones (@) {
 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{"$serial $origin"} = [ $whosaidandwhy ]
+use vars qw(%soas);  # $soa{"$serial $mname"} = [ $whosaidandwhy ]
 use vars qw(%addr_is_ok %warned);
 use vars qw($delg_to_us);
 use vars qw(@to_check); # ($addr,$whyask,$name_if_auth,$glueless_ok, ...)
@@ -484,7 +568,7 @@ sub zone_investigate() {
 
 sub zone_check_nsrrset ($$$$) {
     my ($uaddr,$wa, $name_if_auth, $glueless_ok) = @_;
-    my (@s, $s, $a, %s2g, @glue, $glue, $delgs_or_auths, $wwn, $ww);
+    my (@s, $s, $a, %s2g, @glue, $glue, $delgs_or_auths, $wwn, $ww, $cg);
     my ($rcode);
     $ww= "[$uaddr] $wa";
     verbose("checking delegation by $ww");
@@ -511,9 +595,19 @@ sub zone_check_nsrrset ($$$$) {
 	@glue= @{ $s2g{$s} };
 	if (!@glue) {
 	    zone_warning("glueless NS $s", $ww)
-		unless $glueless_ok || zone_style('~',!$needglue) || 
-		       grep { has_suffix_of($zone,".$_"); }
-			   @{ $cfg->{'conv_glueless'} };
+		unless $glueless_ok
+                    or zone_style('~',!$needglue)
+		    or grep { has_suffix_of($zone,".$_"); }
+			   @{ $cfg->{'conv_glueless'} }
+		    or ((grep { has_suffix_of($s,".$_"); }
+			   @{ $cfg->{'indirect_glue'} }) and
+                        !(grep { has_suffix_of($zone,".$_"); }
+			   @{ $cfg->{'indirect_glue'} }));
+	    foreach $cg (@{ $cfg->{'conv_glueless'} }) {
+		zone_warning("nameserver $s (glueless) in".
+			     " serverless-glueless namespace area $cg", $ww)
+		    if has_suffix_of(".$s",".$cg");
+	    }
 	    ($rcode,@glue)= lookup($s,'a','0',"glueless NS from $ww");
 	    foreach $a (@glue) {
 		$wwn= "glueless NS from $ww";
@@ -530,14 +624,7 @@ sub zone_check_nsrrset ($$$$) {
 
 sub zone_ns_name ($$) {
     my ($name,$ww) = @_;
-    my ($cg);
     $delg_to_us=1 if grep { $name eq $_ } @{ $cfg->{'self_ns'} };
-    foreach $cg (@{ $cfg->{'conv_glueless'} }) {
-	zone_warning("nameserver $name in serverless-glueless".
-		     " namespace area $cg",
-		     $ww)
-	    if has_suffix_of(".$name",".$cg");
-    }
     zone_warning("published server, as $name, but configured as stealth",
 		 $ww)
 	if $cfg->{'s'} =~ m/u/ &&
@@ -553,11 +640,14 @@ sub zone_server_queue ($$$$$) {
 
 sub zone_server_addr ($$$$$) {
     my ($addr,$name,$ww,$wwq,$is_soa) = @_;
-    debug_trace("zone_server_addr ".join '|',@_);
+    debug_trace("zone_server_addr ".join('|',@_));
     $addr_is_ok{$addr}= "$name ($wwq)"
 	if $is_soa || $cfg->{'s'} =~ m/u/;
     zone_warning("forbidden nameserver address [$addr] $name",$ww)
 	if grep { $_ eq $addr } @{ $cfg->{'forbid_addr'} };
+    zone_warning("forbidden server address for our slave [$addr] $name",$ww)
+	if $cfg->{'s'} =~ m/p/ and
+           grep { $_ eq $addr } @{ $cfg->{'forbid_slave'} };
 
     my ($name_is_self, $addr_is_self);
     $name_is_self= grep { $_ eq $name }
@@ -575,7 +665,7 @@ sub zone_server_addr ($$$$$) {
     }
     if (!$name_is_self && !$addr_is_self &&
 	$is_soa && $cfg->{'s'} =~ m/p/) {
-	zone_warning("SOA ORIGIN $name is not us (".
+	zone_warning("SOA MNAME $name is not us (".
 		     (join ' ', @{ $cfg->{'self_soa'} }).")", $ww);
     }
     $delg_to_us=1 if $addr_is_self && !$is_soa;
@@ -583,7 +673,7 @@ sub zone_server_addr ($$$$$) {
 
 sub zone_check_soa ($$$$) {
     my ($uaddr,$wa,$name,$is_ns) = @_;
-    my ($lame,$serial,$origin,$got,$rcode,@soa_addrs,$soa_addr,$ww,$wwn);
+    my ($lame,$serial,$mname,$got,$rcode,@soa_addrs,$soa_addr,$ww,$wwn);
     verbose("checking service at [$uaddr] $name");
     $lame= 'dead or lame';
     $ww= "[$uaddr] $wa";
@@ -591,34 +681,34 @@ sub zone_check_soa ($$$$) {
 	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;
+	    die "several SOAs ? $ww" if defined $mname;
 	    $got= $dig_rdata;
 	    $got =~ m/^(\d+) (\S+)$/ or die "$got ?";
-	    ($serial,$origin) = ($1,$2);
+	    ($serial,$mname) = ($1,$2);
 	}
     },
 	     $zone,'soa',$uaddr);
-    $lame= 'broken' if !$lame && !defined $origin;
+    $lame= 'broken' if !$lame && !defined $mname;
     if ($lame) { zone_warning("$lame server [$uaddr]",$wa); return; }
     progress(2, sprintf "%-16s %46s has %s%s",
 	     $zone, "$name [$uaddr]", $serial, $is_ns ? '' : '*');
     push @{ $soas{$got} }, $ww;
-    ($rcode,@soa_addrs)= lookup($origin,'a','0',"SOA ORIGIN");
-    $wwn= "SOA ORIGIN from $ww";
+    ($rcode,@soa_addrs)= lookup($mname,'a','0',"SOA MNAME");
+    $wwn= "SOA MNAME from $ww";
     foreach $soa_addr (@soa_addrs) {
-	zone_server_queue($soa_addr,$origin,$wwn,"SOA [$uaddr]",1);
+	zone_server_queue($soa_addr,$mname,$wwn,"SOA [$uaddr]",1);
     }
 }
 
 sub zone_consistency() {
-    my ($d, $org_ser, $origin, $a, $h, $self_soa, $wa);
+    my ($d, $org_ser, $mname, $a, $h, $self_soa, $wa);
     zone_consistency_set('delegations',\%delgs);
     foreach $d (keys %delgs) { delete $auths{$d}; }
     zone_consistency_set('zone nameserver rrset',\%auths);
     foreach $h (keys %glue) {
 	zone_consistency_set("glue for $h", $glue{$h});
     }
-    zone_consistency_set("serial number and/or SOA ORIGIN",\%soas);
+    zone_consistency_set("serial number and/or SOA MNAME",\%soas);
     $self_soa= $cfg->{'self_soa'};
 }
 
@@ -662,7 +752,7 @@ sub zone_check_local () {
 }
 
 sub zone_servers_simplefind () {
-    my ($rcode,@nsnames,$ns,@soas,$origin);
+    my ($rcode,@nsnames,$ns,@soas,$mname);
 
     ($rcode,@nsnames)= lookup($zone,'ns-','0',"zone's servers");
     foreach $ns (@nsnames) {
@@ -671,7 +761,7 @@ sub zone_servers_simplefind () {
     }
     $delgs{join ' ', sort @nsnames} = [ "zone's servers" ];
 
-    ($rcode,@soas)= lookup($zone,'soa','0',"SOA ORIGIN");
+    ($rcode,@soas)= lookup($zone,'soa','0',"SOA MNAME");
     die "multiple SOA RRs in set!  @soas ?" if @soas!=1;
     $soas[0] =~ m/^(\S+)\s/ or die "SOA ? $_";
     zone_server_simple(domain_canon($1,"lookup $zone SOA"),'SOA',1);
@@ -681,7 +771,7 @@ sub zone_server_simple ($$$) {
     my ($name,$ww,$is_soa) = @_;
     my ($rcode,@addrs,$addr);
     ($rcode,@addrs)= lookup($name,'a','0', "server - ".
-			    ($is_soa ? "SOA ORIGIN" : "NS"));
+			    ($is_soa ? "SOA MNAME" : "NS"));
     foreach $addr (@addrs) { zone_server_addr($addr,$name,$ww,$ww,$is_soa); }
 }
 
@@ -780,7 +870,14 @@ sub mail_zone_after () {
 	} else {
 	    mail_zone_mail();
 	}
-    }	    
+    } else {
+	printf " %-40s %d warns. OK %s Fail %s\n",
+	    $zone,
+	    defined $zone_warnings{$zone} ? $zone_warnings{$zone} : 0,
+	    join(',', map { $_ - $m_time } @m_ok),
+	    join(',', map { $_ - $m_time } @m_fail)
+		or die "$quis: checking progress report: $!\n";
+    }
 
     @m_fail= @m_ok= ('','')
 	if $domail =~ m/^final/;
@@ -890,8 +987,9 @@ END
     $r == $c or die "$quis: waitpid sendmail ($c): $r $!";
     $? and warn "$quis: sendmail failed: $?\n";
 
-    printf " %-40s %s\n", $zone, $zone_to or
-	die "$quis: write mailing report: $!\n";
+    printf " %-40s %s\n", $zone,
+        length $zone_to ? $zone_to : 'reporting to admin'
+	    or die "$quis: write mailing report: $!\n";
 }
 
 #-------------------- outputting
@@ -1016,7 +1114,7 @@ sub dig (&$$$) {
     if (!$c) {
 	open STDERR, ">&STDOUT" or die $!;
 	exec ('dig',
-	      '+nodef','+nosea','+nodebug','+norecurse',
+	      '+nodef','+nosea','+norecurse',
 	      "\@$qaddr",'-t',$qtype,$qowner);
 	die "$quis: exec dig:\n $!\n";
     }