From: ianmdlvl <ianmdlvl>
Date: Fri, 4 Jan 2002 21:59:05 +0000 (+0000)
Subject: Get lookup result wrong.  Err msgs clarified.
X-Git-Tag: debian_version_2_2_0~25
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=4b016aa9e90e5012f144b5e5f6921588dc61cdbd;p=chiark-utils.git

Get lookup result wrong.  Err msgs clarified.
---

diff --git a/scripts/named-conf b/scripts/named-conf
index ce30194..1767fbe 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -414,7 +414,7 @@ sub zone_server_addr ($$$$$) {
 	zone_warning("our name $name with wrong address [$addr], (eg) $ww")
 	    unless $warned_nameaddr{$name}{$addr}++;
     } elsif (!$name_is_self && $addr_is_self) {
-	zone_warning(($is_soa ? "SOA ORIGIN maps to" : "allegedly served by").
+	zone_warning(($is_soa ? "SOA ORIGIN maps to" : "referral to").
 		     " us [$addr] with wrong name $name, (eg) $ww")
 	    unless $warned_nameaddr{$name}{$addr}++;
     }
@@ -620,7 +620,7 @@ sub lookup ($$$) {
     chomp @result;
     $!=0; $h->close;
     die "$quis: lookup -t$type $domain $okrcodes failed $? $! @result\n"
-	if $! or $?>6 or index($okrcodes,$?)<0;
+	if $! or $?&255 or $?>1536 or index($okrcodes,$?>>8)<0;
     debug_trace("lookup <== $? @result");
     return ($?,@result);
 }