diff --git a/bin/tests/dst/dst_test.c b/bin/tests/dst/dst_test.c
index 4f5bc37d93..892f299129 100644
--- a/bin/tests/dst/dst_test.c
+++ b/bin/tests/dst/dst_test.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_test.c,v 1.33 2000/09/02 01:17:18 bwelling Exp $ */
+/* $Id: dst_test.c,v 1.34 2000/09/12 09:58:44 bwelling Exp $ */
 
 #include <config.h>
 
@@ -113,7 +113,8 @@ dns(dst_key_t *key, isc_mem_t *mctx) {
 	       isc_result_totext(ret));
 	if (ret != ISC_R_SUCCESS)
 		return;
-	ret = dst_key_fromdns(dst_key_name(key), &buf1, mctx, &newkey);
+	ret = dst_key_fromdns(dst_key_name(key), dns_rdataclass_in,
+			      &buf1, mctx, &newkey);
 	printf("fromdns(%d) returned: %s\n", dst_key_alg(key),
 	       isc_result_totext(ret));
 	if (ret != ISC_R_SUCCESS)
@@ -216,7 +217,8 @@ generate(int alg, isc_mem_t *mctx) {
 	isc_result_t ret;
 	dst_key_t *key = NULL;
 
-	ret = dst_key_generate(dns_rootname, alg, 512, 0, 0, 0, mctx, &key);
+	ret = dst_key_generate(dns_rootname, alg, 512, 0, 0, 0,
+			       dns_rdataclass_in, mctx, &key);
 	printf("generate(%d) returned: %s\n", alg, isc_result_totext(ret));
 	if (ret != ISC_R_SUCCESS)
 		return;
diff --git a/bin/tests/dst/t_dst.c b/bin/tests/dst/t_dst.c
index e8a243ad40..2bd0c468d3 100644
--- a/bin/tests/dst/t_dst.c
+++ b/bin/tests/dst/t_dst.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_dst.c,v 1.39 2000/09/02 01:17:20 bwelling Exp $ */
+/* $Id: t_dst.c,v 1.40 2000/09/12 09:58:45 bwelling Exp $ */
 
 #include <config.h>
 
@@ -318,7 +318,8 @@ generate(int alg, isc_mem_t *mctx, int size, int *nfails) {
 	isc_result_t ret;
 	dst_key_t *key = NULL;
 
-	ret = dst_key_generate(dns_rootname, alg, size, 0, 0, 0, mctx, &key);
+	ret = dst_key_generate(dns_rootname, alg, size, 0, 0, 0,
+			       dns_rdataclass_in, mctx, &key);
 	if (ret != ISC_R_SUCCESS) {
 		t_info("dst_key_generate(%d) returned: %s\n", alg,
 		       dst_result_totext(ret));
diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index 882dfec31c..217a832048 100644
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dnssec.c,v 1.50 2000/08/21 23:22:01 gson Exp $
+ * $Id: dnssec.c,v 1.51 2000/09/12 09:57:28 bwelling Exp $
  * Principal Author: Brian Wellington
  */
 
@@ -142,7 +142,7 @@ dns_dnssec_keyfromrdata(dns_name_t *name, dns_rdata_t *rdata, isc_mem_t *mctx,
 	dns_rdata_toregion(rdata, &r);
 	isc_buffer_init(&b, r.base, r.length);
 	isc_buffer_add(&b, r.length);
-	return (dst_key_fromdns(name, &b, mctx, key));
+	return (dst_key_fromdns(name, rdata->rdclass, &b, mctx, key));
 }
 
 isc_result_t
diff --git a/lib/dns/message.c b/lib/dns/message.c
index 55e01e3b93..e39d5fd46b 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.145 2000/09/11 05:55:23 marka Exp $ */
+/* $Id: message.c,v 1.146 2000/09/12 09:57:30 bwelling Exp $ */
 
 /***
  *** Imports
@@ -2646,8 +2646,8 @@ dns_message_checksig(dns_message_t *msg, dns_view_t *view) {
 			isc_buffer_init(&b, rdata.data, rdata.length);
 			isc_buffer_add(&b, rdata.length);
 
-			result = dst_key_fromdns(&sig.signer, &b, view->mctx,
-						 &key);
+			result = dst_key_fromdns(&sig.signer, rdata.rdclass,
+						 &b, view->mctx, &key);
 			if (result != ISC_R_SUCCESS)
 				continue;
 			if (dst_key_alg(key) != sig.algorithm ||
diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 4ad1621384..3df3842ea5 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.88 2000/09/08 07:51:28 bwelling Exp $
+ * $Id: tsig.c,v 1.89 2000/09/12 09:57:31 bwelling Exp $
  * Principal Author: Brian Wellington
  */
 
@@ -235,6 +235,7 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
 		result = dst_key_frombuffer(name, DST_ALG_HMACMD5,
 					    DNS_KEYOWNER_ENTITY,
 					    DNS_KEYPROTO_DNSSEC,
+					    dns_rdataclass_in,
 					    &b, mctx, &dstkey);
 		if (result != ISC_R_SUCCESS)
 			return (result);
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 6ad76eb534..253a454ec0 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.78 2000/09/08 14:18:17 bwelling Exp $ */
+/* $Id: validator.c,v 1.79 2000/09/12 09:57:32 bwelling Exp $ */
 
 #include <config.h>
 
@@ -606,8 +606,8 @@ containsnullkey(dns_validator_t *val, dns_rdataset_t *rdataset) {
 		 * The key name is unimportant, so we can avoid any name/text
 		 * conversion.
 		 */
-		result = dst_key_fromdns(dns_rootname, &b, val->view->mctx,
-					 &key);
+		result = dst_key_fromdns(dns_rootname, rdata.rdclass, &b,
+					 val->view->mctx, &key);
 		if (result != ISC_R_SUCCESS)
 			continue;
 		if (dst_key_isnullkey(key))
@@ -651,8 +651,8 @@ get_dst_key(dns_validator_t *val, dns_rdata_sig_t *siginfo,
 		isc_buffer_init(&b, rdata.data, rdata.length);
 		isc_buffer_add(&b, rdata.length);
 		INSIST(val->key == NULL);
-		result = dst_key_fromdns(&siginfo->signer, &b, val->view->mctx,
-					 &val->key);
+		result = dst_key_fromdns(&siginfo->signer, rdata.rdclass, &b,
+					 val->view->mctx, &val->key);
 		if (result != ISC_R_SUCCESS)
 			goto failure;
 		if (siginfo->algorithm ==
diff --git a/lib/omapi/auth.c b/lib/omapi/auth.c
index b5b2a45eb3..fb58f4985d 100644
--- a/lib/omapi/auth.c
+++ b/lib/omapi/auth.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: auth.c,v 1.13 2000/08/26 01:42:30 bwelling Exp $ */
+/* $Id: auth.c,v 1.14 2000/09/12 09:59:28 bwelling Exp $ */
 
 /* Principal Author: DCL */
 
@@ -147,8 +147,8 @@ auth_makekey(const char *name, unsigned int algorithm, dst_key_t **key) {
 					   ISC_FALSE, &dstb);
 		if (result == ISC_R_SUCCESS)
 			result = dst_key_frombuffer(&dnsname, dst_algorithm,
-						    0, 0, &secret,
-						    omapi_mctx, key);
+						    0, 0, dns_rdataclass_in,
+						    &secret, omapi_mctx, key);
 	}
 
 	UNLOCK(&mutex);