pullup:

Having a non-noerror value inn the tsig error field should always return
DNS_R_TSIGERRORSET in dns_tsig_verify.  Change the result text to reflect
this.

diff --git a/lib/dns/result.c b/lib/dns/result.c
index 1160b6b203eb01317aebec1943b3ff80b151bf6b..9699762da7481b0811e7513b06e56b8e462713e3 100644 (file)
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: result.c,v 1.63.2.1 2000/07/05 20:49:04 gson Exp $ */
+/* $Id: result.c,v 1.63.2.2 2000/07/28 19:41:16 gson Exp $ */
 
 #include <config.h>
 
@@ -65,7 +65,7 @@ static const char *text[DNS_R_NRESULTS] = {
        "more data",                            /* 36 */
        "up to date",                           /* 37 */
        "tsig verify failure",                  /* 38 */
-       "tsig error set in query",              /* 39 */
+       "tsig indicates error",                 /* 39 */
        "SIG failed to verify",                 /* 40 */
        "SIG has expired",                      /* 41 */
        "SIG validity period has not begun",    /* 42 */

diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index dc3410b43f11e7fde821e5384ca0e65fe194c2ec..2c8f22f27e30b043bb25fc7ab7be28ce68fe2a13 100644 (file)
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.72.2.5 2000/07/28 00:13:40 gson Exp $
+ * $Id: tsig.c,v 1.72.2.6 2000/07/28 19:41:14 gson Exp $
  * Principal Author: Brian Wellington
  */
 
@@ -30,6 +30,7 @@
 #include <isc/util.h>
 
 #include <dns/keyvalues.h>
+#include <dns/log.h>
 #include <dns/message.h>
 #include <dns/rbt.h>
 #include <dns/rdata.h>
@@ -782,14 +783,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
 
        msg->tsigstatus = dns_rcode_noerror;
 
-       if (tsig.error != dns_rcode_noerror) {
-               if (is_response(msg)) {
-                       /* XXXBEW Log a message */
-                       return (ISC_R_SUCCESS);
-               }
-               else
-                       return (DNS_R_TSIGERRORSET);
-       }
+       if (tsig.error != dns_rcode_noerror)
+               return (DNS_R_TSIGERRORSET);
 
        msg->verified_sig = 1;