X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=scripts%2Fnamed-conf;h=ce3019444f6a8e14d50cb88d442c69dcbb098830;hb=3e6eed8621ad938b6c40b6a85c050811fbceae87;hp=a6d7df8ca2fbcdbeaa056da584715ff917f33fb1;hpb=080e68c9adee644e6923e3d6f4ad3cd4102efea7;p=chiark-utils.git

diff --git a/scripts/named-conf b/scripts/named-conf
index a6d7df8..ce30194 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -3,6 +3,7 @@
 use strict;
 use IO::File;
 use Data::Dumper;
+use POSIX;
 
 use vars qw($quis
 	    $mode $doall
@@ -72,20 +73,19 @@ usage: named-conf-regen [-rvq] -f|-y|-n|<zone>...\n".
 " -v --verbose extra verbose\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_addr);
-@self_ns= @self_soa= @self_addr= ();
+use vars qw(@self_ns @self_soa @self_addr @forbid_addr);
+@self_ns= @self_soa= @self_addr= @forbid_addr= ();
 
 use vars qw(%zone_cfg @zone_cfg_list);
 %zone_cfg= ();
@@ -104,6 +104,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 +114,23 @@ sub cfg_fail ($) { die "$quis: $where:\n $_[0]\n"; }
 
 sub read_config ($) {
     my ($if) = @_;
-    my ($fh,$z,@self, $mod,$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/;
@@ -133,10 +140,20 @@ sub read_config ($) {
 	    @self_soa= @self if $1 ne '-ns';
 	} 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;
+	} 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,7 +162,13 @@ 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+)$/) {
@@ -154,8 +177,10 @@ sub read_config ($) {
 	    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+))?$/) {
+	} 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,7 +197,7 @@ sub read_config ($) {
 
 sub qualify ($) {
     my ($i) = @_;
-    $i= "$default_dir/$i" unless $i =~ m,^/,;
+    $i= "$default_dir$i" unless $i =~ m,^/,;
     return $i;
 }
 
@@ -186,7 +211,10 @@ 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'}= $sabbr.$mod; # p)rimary s)econdary u)npub f)oreign
@@ -246,7 +274,8 @@ sub process_zones (@) {
 	    };
 	    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;
@@ -261,14 +290,14 @@ 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 %warned_glueless %warned_mynameaddr);
+use vars qw(%addr_is_ok %warned_glueless %warned_nameaddr);
 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, ...)
@@ -282,7 +311,7 @@ sub zone_check_full () {
 
 sub zone_reset() {
     %delgs= %auths= %glue= %soas=
-	%warned_glueless= %warned_mynameaddr=
+	%warned_glueless= %warned_nameaddr=
 	    %addr_is_ok= ();
     $delg_to_us= 0;
     @to_check= @to_check_soa= ();
@@ -373,6 +402,8 @@ sub zone_server_addr ($$$$$) {
     zone_warning("configured as stealth but we [$addr]".
 		 " are published ($name $wwq)")
 	if $cfg->{'s'} =~ m/u/ && grep { $_ eq $addr } @self_addr;
+    zone_warning("forbidden nameserver address [$addr] $name ($wwq)")
+	if grep { $_ eq $addr } @forbid_addr;
 
     my ($name_is_self, $addr_is_self);
     $name_is_self= grep { $_ eq $name }
@@ -381,11 +412,11 @@ sub zone_server_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}++;
+	    unless $warned_nameaddr{$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}++;
+	    unless $warned_nameaddr{$name}{$addr}++;
     }
     $delg_to_us=1 if $name_is_self;
 }
@@ -453,8 +484,8 @@ 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");
+	zone_warning("we are supposedly published secondary,".
+		     " but not listed as a nameserver");
     }
 }
 
@@ -497,18 +528,64 @@ sub zone_server_simple ($$$) {
 #-------------------- 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
 
@@ -542,7 +619,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);