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

diff --git a/scripts/named-conf b/scripts/named-conf
index a6d7df8..24f9906 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -113,17 +113,22 @@ 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,$lprefix,$lsuffix);
     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/;
@@ -261,7 +266,7 @@ 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 ]
@@ -542,7 +547,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);