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:
574e086
)
Bugfixes etc.
author
ianmdlvl
<ianmdlvl>
Mon, 31 Dec 2001 20:20:12 +0000
(20:20 +0000)
committer
ianmdlvl
<ianmdlvl>
Mon, 31 Dec 2001 20:20:12 +0000
(20:20 +0000)
scripts/named-conf
patch
|
blob
|
history
diff --git
a/scripts/named-conf
b/scripts/named-conf
index 694ab940adff6fdf84f0fa975127a2dd8d2beec5..24f99068e4ee1ee95835b2a660714955f52876e0 100755
(executable)
--- a/
scripts/named-conf
+++ b/
scripts/named-conf
@@
-113,7
+113,7
@@
sub cfg_fail ($) { die "$quis: $where:\n $_[0]\n"; }
sub read_config ($) {
my ($if) = @_;
sub read_config ($) {
my ($if) = @_;
- my ($fh,$z,@self, $mod,$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 $!");
local ($_);
$fh= new IO::File $if,'r' or cfg_fail("open $if:\n $!");
@@
-123,10
+123,11
@@
sub read_config ($) {
cfg_fail("read config file $if:\n $!") if $fh->error();
last;
}
cfg_fail("read config file $if:\n $!") if $fh->error();
last;
}
-
s/^\s+//;
chomp; s/\s+$//;
+ chomp; s/\s+$//;
if (m/\\$/) { $before.= $_; next; }
$_= $before.$_;
$before= '';
if (m/\\$/) { $before.= $_; next; }
$_= $before.$_;
$before= '';
+ s/^\s+//;
$where= "$if:$.";
next if m/^\#/;
last if m/^end$/;
$where= "$if:$.";
next if m/^\#/;
last if m/^end$/;
@@
-265,7
+266,7
@@
sub zone_warning ($) {
}
sub zone_warnmore ($) {
}
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(%delgs); # $delgs{$nameserver_list} = [ $whosaidandwhy ]
@@
-546,7
+547,7
@@
sub lookup ($$$) {
$h->error and die "$quis: read from adnshost:\n $!\n";
chomp @result;
$!=0; $h->close;
$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);
if $! or $?>6 or index($okrcodes,$?)<0;
debug_trace("lookup <== $? @result");
return ($?,@result);