$debug= 0;
$needglue= 1;
$localonly= 0;
-$verbosity= 1;
+$verbosity= 2;
$repeat= 0;
use vars qw($dig_owner $dig_type $dig_rdata);
elsif (m/^config$/) { $etcfile= loarg(); $where= '--config option'; }
elsif (m/^glueless$/) { $needglue=0; }
elsif (m/^localonly$/) { $localonly=1; }
- elsif (m/^quiet$/) { $verbosity=0; }
+ elsif (m/^quiet$/) { $verbosity--; }
elsif (m/^repeat$/) { $repeat=1; }
- elsif (m/^verbose$/) { $verbosity=2; }
+ elsif (m/^verbose$/) { $verbosity++; }
else { usageerr("unknown option --$_"); }
} else {
s/^\-//;
elsif (s/^D//) { $debug++; }
elsif (s/^g//) { $needglue=0; }
elsif (s/^l//) { $localonly=1; }
- elsif (s/^q//) { $verbosity=0; }
+ elsif (s/^q//) { $verbosity--; }
elsif (s/^r//) { $repeat=1; }
- elsif (s/^v//) { $verbosity=2; }
+ elsif (s/^v//) { $verbosity++; }
else { usageerr("unknown option -$&"); }
}
}
sub loarg() { usageerr("missing option value") if !@ARGV; return shift @ARGV; }
sub soarg() { my ($rv); $rv=$_; $_=''; return length $rv ? $rv : loarg(); }
+usageerr("-q may be specified at most twice") if $verbosity<0;
+usageerr("-v may be specified at most once") if $verbosity>3;
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;
sub usageerr ($) {
- die
-"$_[0]
-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".
-" -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";
+ die <<END;
+$_[0]
+
+usage: chiark-named-conf [options] -f|-y|-n|<zone>...
+operation modes:
+ -f --force install without checking
+ -y --yes check and install
+ -n --no check only (configured zones)
+ <zone> ... check only (specified zones, even unconfigured ones)
+additional options:
+ -A --all report on zones marked ? (ones we know are broken)
+ -D debug $quis (does not help debug your DNS config)
+ -g --glueless do not warn about any glueless referrals (not recommended)
+ -l --localonly full checks only on zones which we primary
+ -q --quiet no output for OK zones
+ -r --repeat repeat warnings for all sources of imperfect data
+ -v --verbose extra verbose info about each zone
+ -C|--config <DIR/FILE use FILE as default config and DIR as default dir
+
+chiark-named-conf is Copyright 2002 Ian Jackson. It is Free software, under
+the GNU General Public License, and you are welcome to change it and/or
+distribute copies under certain conditions. There is ABSOLUTELY NO WARRANTY.
+END
}
cfg_fail("config filename $etcfile should not be directory")
use vars qw($zone $cfg $warnings %zone_warnings);
$warnings= 0;
-sub progress ($) {
- return if !$verbosity;
- print "$_[0]\n";
+sub progress ($$) {
+ my ($minv,$m) = @_;
+ return if $verbosity < $minv;
+ print "$m\n";
}
-sub verbose ($) {
- return if $verbosity<2;
- print " $_[0]\n";
-}
+sub verbose ($) { progress(3, ' ' . $_[0]); }
sub process_zones (@) {
my (@zones) = @_;
's' => 'f',
'servers' => [ ],
};
- progress(sprintf "%-40s %s", $zone, $$cfg{'style_p'});
+ progress(1, sprintf "%-20s %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/)) {
+ } elsif ($localonly && $cfg->{'s'} !~ m/p/) {
zone_check_local();
} else {
zone_check_full();
scalar(keys %zone_warnings),
scalar(@zones - keys %zone_warnings));
} else {
- progress(sprintf "%d zone(s) checked ok", scalar @zones);
+ progress(1, sprintf "%d zone(s) checked ok", scalar @zones);
}
}
use vars qw(%soas); # $soa{"$serial $origin"} = [ $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, ...)
+use vars qw(@to_check); # ($addr,$whyask,$name_if_auth,$glueless_ok, ...)
+use vars qw(@to_check_soa); # ($addr,$whyask,$name,$is_ns, ...)
sub zone_warning ($$) {
my ($w,$o) = @_;
}
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);
+ my ($super_zone, @start_nsnames, $start_ww,
+ $start_ns, @start_ns_addrs, $s, $wa, $name_if_auth,
+ %nsrrset_checked, %soa_checked, $addr, $glueless_ok,
+ $rcode, $name, $is_ns);
- $super_zone= $zone;
- for (;;) {
- debug_trace("zone $zone superzone $super_zone");
- $super_zone =~ s/^[^.]+\.// or die "no superzone ? ($super_zone)\n";
- ($rcode,@super_nsnames)=
- lookup($super_zone,'ns-','06',"superzone search");
- last if !$rcode;
+ if ($cfg->{'s'} !~ m/\*/) {
+ $super_zone= $zone;
+ for (;;) {
+ debug_trace("zone $zone superzone $super_zone");
+ $super_zone =~ s/^[^.]+\.//
+ or die "no superzone ? ($super_zone)\n";
+ ($rcode,@start_nsnames)=
+ lookup($super_zone,'ns-','06',"superzone search");
+ last if !$rcode;
+ }
+ $start_ww= "server for $super_zone";
+ } else {
+ ($rcode,@start_nsnames)=
+ lookup($zone,'ns-','0',"initial nameserver search");
+ $start_ww= "nameserver for $zone";
}
- for $super_ns (@super_nsnames) {
- $super_ns= lc $super_ns;
- ($rcode,@super_ns_addrs)=
- lookup($super_ns,'a','0',"published nameserver");
- foreach $addr (@super_ns_addrs) {
- push @to_check,
- $addr,
- "$super_ns, server for $super_zone",
- 0, 0;
+ for $start_ns (@start_nsnames) {
+ $start_ns= lc $start_ns;
+ ($rcode,@start_ns_addrs)= lookup($start_ns,'a','0',"$start_ww");
+ foreach $addr (@start_ns_addrs) {
+ push @to_check, $addr, "$start_ns, $start_ww", undef, 0;
}
}
for (;;) {
# we might set nsrrset_checked due to a glueless_ok check,
# and then not check for gluefulness later.
debug_dump('@to_check @to_check_soa');
- if (($addr,$wa,$is_auth,$glueless_ok,@to_check) = @to_check) {
- push @to_check_soa, $addr, $wa if $is_auth;
+ if (($addr,$wa,$name_if_auth,$glueless_ok,@to_check) = @to_check) {
+ push @to_check_soa, $addr, $wa, $name_if_auth, 1,
+ if defined $name_if_auth;
next if $nsrrset_checked{$addr}++;
- zone_check_nsrrset($addr, $wa, $is_auth, $glueless_ok);
- } elsif (($addr,$wa,@to_check_soa) = @to_check_soa) {
+ zone_check_nsrrset($addr, $wa, $name_if_auth, $glueless_ok);
+ } elsif (($addr,$wa,$name,$is_ns,@to_check_soa) = @to_check_soa) {
next if $soa_checked{$addr}++;
- zone_check_soa($addr, $wa, "NS [$addr]");
+ zone_check_soa($addr,$wa,$name,$is_ns);
} else {
last;
}
}
sub zone_check_nsrrset ($$$$) {
- my ($uaddr,$wa, $is_auth, $glueless_ok) = @_;
- my (@s, $s, %s2g, @glue, $glue, $delgs_or_auths, $wwn, $ww);
+ my ($uaddr,$wa, $name_if_auth, $glueless_ok) = @_;
+ my (@s, $s, $a, %s2g, @glue, $glue, $delgs_or_auths, $wwn, $ww);
+ my ($rcode);
$ww= "[$uaddr] $wa";
verbose("checking delegation by $ww");
dig(sub {
$s2g{lc $dig_rdata} = [ ];
} elsif ($dig_type eq 'a' && exists $s2g{$dig_owner}) {
$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);
+ zone_server_queue($dig_rdata,$dig_owner,$wwn,"NS [$uaddr]",0);
push @{ $s2g{$dig_owner} }, $dig_rdata;
}
},
unless $glueless_ok || !$needglue ||
grep { has_suffix_of($s,".$_"); }
@{ $cfg->{'conv_glueless'} };
- next;
+ ($rcode,@glue)= lookup($s,'a','0',"glueless NS from $ww");
+ foreach $a (@glue) {
+ $wwn= "glueless NS from $ww";
+ zone_server_queue($a,$s,$wwn,"NS [$uaddr]",0);
+ }
}
$glue= join ' ', sort @glue;
push @{ $glue{$s}{$glue} }, $ww;
}
$s= join ' ', @s;
- $delgs_or_auths= $is_auth ? \%auths : \%delgs;
+ $delgs_or_auths= defined($name_if_auth) ? \%auths : \%delgs;
push @{ $delgs_or_auths->{$s} }, $ww;
}
@{ $cfg->{'self_ns'} }, @{ $cfg->{'self_soa'} };
}
+sub zone_server_queue ($$$$$) {
+ my ($addr,$name,$wwn,$wwq,$is_soa) = @_;
+ zone_server_addr($addr,$name,$wwn,$wwq,$is_soa);
+ push @to_check, $addr, "$name, $wwn", $name, $is_soa;
+}
+
sub zone_server_addr ($$$$$) {
my ($addr,$name,$ww,$wwq,$is_soa) = @_;
debug_trace("zone_server_addr ".join '|',@_);
$delg_to_us=1 if $addr_is_self && !$is_soa;
}
-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");
+sub zone_check_soa ($$$$) {
+ my ($uaddr,$wa,$name,$is_ns) = @_;
+ my ($lame,$serial,$origin,$got,$rcode,@soa_addrs,$soa_addr,$ww,$wwn);
+ verbose("checking service at [$uaddr] $name");
$lame= 'dead or lame';
$ww= "[$uaddr] $wa";
dig(sub {
} elsif ($dig_type eq 'soa' && $dig_owner eq $zone && !$lame) {
die "several SOAs ? $ww" if defined $origin;
$got= $dig_rdata;
- $got =~ m/^\d+ (\S+)$/ or die "$got ?";
- $origin= $1;
+ $got =~ m/^(\d+) (\S+)$/ or die "$got ?";
+ ($serial,$origin) = ($1,$2);
}
},
$zone,'soa',$uaddr);
$lame= 'broken' if !$lame && !defined $origin;
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";
foreach $soa_addr (@soa_addrs) {
- zone_server_addr($soa_addr,$origin,$wwn,"SOA [$uaddr]",1);
- push @to_check, $soa_addr, "$origin, $wwn", 1, 1;
+ zone_server_queue($soa_addr,$origin,$wwn,"SOA [$uaddr]",1);
}
}
zone_ns_name($ns,"NS");
zone_server_simple($ns,'NS',0);
}
+ $delgs{join ' ', sort @nsnames} = [ "zone's servers" ];
($rcode,@soas)= lookup($zone,'soa','0',"SOA ORIGIN");
die "multiple SOA RRs in set! @soas ?" if @soas!=1;
~ian / chiark-utils.git / blobdiff