chiark
/
gitweb
/
~ian
/
chiark-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
85bed52
)
Bugfixes etc.
author
ianmdlvl
<ianmdlvl>
Mon, 31 Dec 2001 18:46:09 +0000
(18:46 +0000)
committer
ianmdlvl
<ianmdlvl>
Mon, 31 Dec 2001 18:46:09 +0000
(18:46 +0000)
scripts/named-conf
patch
|
blob
|
history
diff --git
a/scripts/named-conf
b/scripts/named-conf
index 506b5b16358d70add6132533524881bde082bb39..359c61c08bb6ac14ea298bd91c4a7e3a9eeb2a1d 100755
(executable)
--- a/
scripts/named-conf
+++ b/
scripts/named-conf
@@
-192,9
+192,9
@@
sub zone_conf ($$$$$@) {
$zone_cfg{$zone}{'s'}= $sabbr.$mod; # p)rimary s)econdary u)npub f)oreign
$zone_cfg{$zone}{'servers'}= [ @servers ];
foreach $sfx (qw(soa ns addr)) {
$zone_cfg{$zone}{'s'}= $sabbr.$mod; # p)rimary s)econdary u)npub f)oreign
$zone_cfg{$zone}{'servers'}= [ @servers ];
foreach $sfx (qw(soa ns addr)) {
- $aref= [ @{ "self_$sfx" } ];
+ { no strict 'refs'; $aref= [ @{ "self_$sfx" } ]; }
@$aref or cfg_fail("failed to specify self-$sfx before zone");
@$aref or cfg_fail("failed to specify self-$sfx before zone");
- $zone_cfg{$zone}{
'self_soa'
}= $aref;
+ $zone_cfg{$zone}{
"self_$sfx"
}= $aref;
}
$zone_cfg{$zone}{'output'}= $output;
push @zone_cfg_list, $zone;
}
$zone_cfg{$zone}{'output'}= $output;
push @zone_cfg_list, $zone;
@@
-268,7
+268,7
@@
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(%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(@to_check); # ($addr,$whyask,$is_auth,$glueless_ok, ...)
use vars qw(@to_check_soa); # ($addr,$whyask, ...)
use vars qw(@to_check); # ($addr,$whyask,$is_auth,$glueless_ok, ...)
use vars qw(@to_check_soa); # ($addr,$whyask, ...)
@@
-280,7
+280,9
@@
sub zone_check_full () {
}
sub zone_reset() {
}
sub zone_reset() {
- %delgs= %auths= %glue= %soas= %gluelesswarned= %addr_is_ok= ();
+ %delgs= %auths= %glue= %soas=
+ %warned_glueless= %warned_mynameaddr=
+ %addr_is_ok= ();
@to_check= @to_check_soa= ();
}
@to_check= @to_check_soa= ();
}
@@
-319,7
+321,7
@@
sub zone_investigate() {
$is_auth, $glueless_ok);
} elsif (($addr,$wa,@to_check_soa) = @to_check_soa) {
next if $soa_checked{$addr}++;
$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;
}
} else {
last;
}
@@
-328,17
+330,15
@@
sub zone_investigate() {
sub zone_check_nsrrset ($$$$) {
my ($uaddr,$ww, $is_auth, $glueless_ok) = @_;
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}) {
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]",0);
+ $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;
}
},
push @{ $s2g{$dig_owner} }, $dig_rdata;
}
},
@@
-353,7
+353,7
@@
sub zone_check_nsrrset ($$$$) {
($needglue<=1 ? " (eg)" : "").
" from $ww")
unless $glueless_ok || !$needglue ||
($needglue<=1 ? " (eg)" : "").
" from $ww")
unless $glueless_ok || !$needglue ||
- ($needglue<=1 && $
gluelesswarned
{$s}++);
+ ($needglue<=1 && $
warned_glueless
{$s}++);
next;
}
$glue= join ' ', sort @glue;
next;
}
$glue= join ' ', sort @glue;
@@
-364,12
+364,12
@@
sub zone_check_nsrrset ($$$$) {
push @{ $delgs_or_auths->{$s} }, $ww;
}
push @{ $delgs_or_auths->{$s} }, $ww;
}
-sub zone_server_addr ($$$$) {
- my ($addr,$name,$ww,$is_soa) = @_;
- $addr_is_ok{$addr}= "$name ($ww)"
+sub zone_server_addr ($$$$
$
) {
+ my ($addr,$name,$ww,$
wwq,$
is_soa) = @_;
+ $addr_is_ok{$addr}= "$name ($ww
q
)"
if $is_soa || $cfg->{'s'} =~ m/u/;
zone_warning("configured as stealth but we [$addr]".
if $is_soa || $cfg->{'s'} =~ m/u/;
zone_warning("configured as stealth but we [$addr]".
- " are published ($name $ww)")
+ " are published ($name $ww
q
)")
if $cfg->{'s'} =~ m/u/ && grep { $_ eq $addr } @self_addr;
my ($name_is_self, $addr_is_self);
if $cfg->{'s'} =~ m/u/ && grep { $_ eq $addr } @self_addr;
my ($name_is_self, $addr_is_self);
@@
-378,18
+378,19
@@
sub zone_server_addr ($$$$) {
$addr_is_self= grep { $_ eq $addr }
@{ $cfg->{'self_addr'} };
if ($name_is_self && !$addr_is_self) {
$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) {
} 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}++
;
}
}
}
}
-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 $ww
q
");
$lame= 'dead or lame';
dig(sub {
if ($dig_type eq 'flags:') {
$lame= 'dead or lame';
dig(sub {
if ($dig_type eq 'flags:') {
@@
-407,10
+408,9
@@
sub zone_check_soa ($$) {
push @{ $soas{$got} }, $ww;
($rcode,@soa_addrs)= lookup($origin,'a','0');
foreach $soa_addr (@soa_addrs) {
push @{ $soas{$got} }, $ww;
($rcode,@soa_addrs)= lookup($origin,'a','0');
foreach $soa_addr (@soa_addrs) {
- zone_server_addr($soa_addr,$origin,"SOA [$uaddr]",1);
- 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";
}
}
}
}
@@
-429,8
+429,8
@@
sub zone_consistency() {
$org_ser =~ m/^(\S+) \d+$/ or die "$org_ser ?";
$origin= $1;
next if grep { $_ eq $origin } @$self_soa;
$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
]));
+ zone_warning("
SOA ORIGIN $origin is not our name (@$self_soa)
,".
+ " eg from ".(
$soas{$org_ser}[0
]));
}
}
}
}
}
}
@@
-481,10
+481,10
@@
sub zone_servers_simplefind () {
}
sub zone_server_simple ($$$) {
}
sub zone_server_simple ($$$) {
- my ($name,$w
hy
,$is_soa) = @_;
+ my ($name,$w
w
,$is_soa) = @_;
my ($rcode,@addrs,$addr);
($rcode,@addrs)= lookup($name,'a','0');
my ($rcode,@addrs,$addr);
($rcode,@addrs)= lookup($name,'a','0');
- foreach $addr (@addrs) { zone_server_addr($addr,$name,$w
hy
,$is_soa); }
+ foreach $addr (@addrs) { zone_server_addr($addr,$name,$w
w,$ww
,$is_soa); }
}
#-------------------- outputting
}
#-------------------- outputting