pullup:

 442.   [bug]           TSIG signed messages that did not match any view
                        crashed the server. [RT #290]

diff --git a/CHANGES b/CHANGES
index 5ce4ea61a03bc7a2184e8087aa5058cbb434d080..b781d729bcc427f5ca5abfac74ed909b34dd5327 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ 442.  [bug]           TSIG signed messages that did not match any view
+                       crashed the server. [RT #290]
 
  436.  [bug]           If recvmsg() returned EHOSTUNREACH or ENETUNREACH,
                        which sometimes happens on Linux, named would enter

diff --git a/lib/dns/message.c b/lib/dns/message.c
index b56f72bbc27acdc8f418a22cc7c812af2cd3d02f..a62732d21f9cba29f468d02f90f40f566a90c5e0 100644 (file)
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: message.c,v 1.131.2.7 2000/09/07 22:39:03 gson Exp $ */
+/* $Id: message.c,v 1.131.2.8 2000/09/11 17:56:07 gson Exp $ */
 
 /***
  *** Imports
@@ -2207,7 +2207,7 @@ dns_message_reply(dns_message_t *msg, isc_boolean_t want_question_section) {
         * This saves the query TSIG status, if the query was signed, and
         * reserves space in the reply for the TSIG.
         */
-       if (msg->querytsig != NULL) {
+       if (msg->tsigkey != NULL) {
                unsigned int otherlen = 0;
                msg->querytsigstatus = msg->tsigstatus;
                msg->tsigstatus = dns_rcode_noerror;