pullup:

here's no real difference between the sring and dring parameters, so
call them ring1 and ring2 instead.  Also remove a bogus assertion.

diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index 4a4e84fb946056b791b593b577d99013bc7707af..1b3076ecfea9720710a0f8b2ccb7c910cc546de2 100644 (file)
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: tsig.h,v 1.24.2.2 2000/07/27 23:57:35 gson Exp $ */
+/* $Id: tsig.h,v 1.24.2.3 2000/07/28 00:00:23 gson Exp $ */
 
 #ifndef DNS_TSIG_H
 #define DNS_TSIG_H 1
@@ -155,7 +155,7 @@ dns_tsig_sign(dns_message_t *msg);
 
 isc_result_t
 dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
-               dns_tsig_keyring_t *sring, dns_tsig_keyring_t *dring);
+               dns_tsig_keyring_t *ring1, dns_tsig_keyring_t *ring2);
 /*
  *     Verifies the TSIG record in this message
  *
@@ -165,8 +165,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
  *             'msg->tsigkey' is a valid TSIG key if this is a response
  *             'msg->tsig' is NULL
  *             'msg->querytsig' is not NULL if this is a response
- *             'sring' is a valid keyring or NULL
- *             'dring' is a valid keyring or NULL
+ *             'ring1' and 'ring2' are each either a valid keyring or NULL
  *
  *     Returns:
  *             ISC_R_SUCCESS

diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 07b67fe72feed60b1a80bd45fbe5191cfa1d14a9..c65f8eca8dce963bfb4f190667fe42284eac0d8b 100644 (file)
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.72.2.3 2000/07/27 23:57:33 gson Exp $
+ * $Id: tsig.c,v 1.72.2.4 2000/07/28 00:00:18 gson Exp $
  * Principal Author: Brian Wellington
  */
 
@@ -548,7 +548,7 @@ cleanup_other:
 
 isc_result_t
 dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
-               dns_tsig_keyring_t *sring, dns_tsig_keyring_t *dring)
+               dns_tsig_keyring_t *ring1, dns_tsig_keyring_t *ring2)
 {
        dns_rdata_any_tsig_t tsig, querytsig;
        isc_region_t r, source_r, header_r, sig_r;
@@ -635,15 +635,13 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
         */
        if (tsigkey == NULL) {
                ret = ISC_R_NOTFOUND;
-               if (sring != NULL)
+               if (ring1 != NULL)
                        ret = dns_tsigkey_find(&tsigkey, keyname,
-                                              &tsig.algorithm, sring); 
-               if (ret == ISC_R_NOTFOUND && dring != NULL)
+                                              &tsig.algorithm, ring1); 
+               if (ret == ISC_R_NOTFOUND && ring2 != NULL)
                        ret = dns_tsigkey_find(&tsigkey, keyname,
-                                              &tsig.algorithm, dring);
+                                              &tsig.algorithm, ring2);
                if (ret != ISC_R_SUCCESS) {
-                       if (dring == NULL)
-                               return (DNS_R_TSIGVERIFYFAILURE);
                        msg->tsigstatus = dns_tsigerror_badkey;
                        ret = dns_tsigkey_create(keyname, &tsig.algorithm,
                                                 NULL, 0, ISC_FALSE, NULL,