diff --git a/bin/tests/rbt/t_rbt.c b/bin/tests/rbt/t_rbt.c
index f88cdbcf65..7ab057af1f 100644
--- a/bin/tests/rbt/t_rbt.c
+++ b/bin/tests/rbt/t_rbt.c
@@ -234,7 +234,7 @@ t1_search(char *name, dns_rbt_t *rbt, isc_mem_t *mctx, isc_result_t *dns_result)
 			dns_fixedname_init(&dns_fixedname);
 			dns_foundname = dns_fixedname_name(&dns_fixedname);
 			data = NULL;
-			*dns_result = dns_rbt_findname(rbt, dns_searchname,
+			*dns_result = dns_rbt_findname(rbt, dns_searchname, 0,
 						dns_foundname, &data);
 			delete_name(dns_searchname, mctx);
 		}
@@ -779,8 +779,9 @@ t_dns_rbtnodechain_init(char *dbfile, char *findname,
 	/* set the starting node */
 	node = NULL;
 	dns_result = dns_rbt_findnode(rbt, dns_fixedname_name(&dns_findname),
-					dns_fixedname_name(&dns_foundname),
-					&node, &chain, ISC_TRUE, NULL, NULL);
+				      dns_fixedname_name(&dns_foundname),
+				      &node, &chain, DNS_RBTFIND_EMPTYDATA,
+				      NULL, NULL);
 
 	if (dns_result != ISC_R_SUCCESS) {
 		t_info("dns_rbt_findnode failed %s\n", dns_result_totext(dns_result));
@@ -806,8 +807,9 @@ t_dns_rbtnodechain_init(char *dbfile, char *findname,
 	node = NULL;
 	dns_fixedname_init(&dns_foundname);
 	dns_result = dns_rbt_findnode(rbt, dns_fixedname_name(&dns_findname),
-					dns_fixedname_name(&dns_foundname),
-					&node, &chain, ISC_TRUE, NULL, NULL);
+				      dns_fixedname_name(&dns_foundname),
+				      &node, &chain, DNS_RBTFIND_EMPTYDATA,
+				      NULL, NULL);
 
 	if (dns_result != ISC_R_SUCCESS) {
 		t_info("\tdns_rbt_findnode failed %s\n", dns_result_totext(dns_result));
@@ -1333,8 +1335,9 @@ t_dns_rbtnodechain_next(char *dbfile, char *findname,
 	/* set the starting node */
 	node = NULL;
 	dns_result = dns_rbt_findnode(rbt, dns_fixedname_name(&dns_findname),
-					dns_fixedname_name(&dns_foundname),
-					&node, &chain, ISC_TRUE, NULL, NULL);
+				      dns_fixedname_name(&dns_foundname),
+				      &node, &chain, DNS_RBTFIND_EMPTYDATA,
+				      NULL, NULL);
 
 	if (dns_result != ISC_R_SUCCESS) {
 		t_info("dns_rbt_findnode failed %s\n", dns_result_totext(dns_result));
@@ -1504,8 +1507,9 @@ t_dns_rbtnodechain_prev(char *dbfile, char *findname,
 	/* set the starting node */
 	node = NULL;
 	dns_result = dns_rbt_findnode(rbt, dns_fixedname_name(&dns_findname),
-					dns_fixedname_name(&dns_foundname),
-					&node, &chain, ISC_TRUE, NULL, NULL);
+				      dns_fixedname_name(&dns_foundname),
+				      &node, &chain, DNS_RBTFIND_EMPTYDATA,
+				      NULL, NULL);
 
 	if (dns_result != ISC_R_SUCCESS) {
 		t_info("dns_rbt_findnode failed %s\n", dns_result_totext(dns_result));
diff --git a/bin/tests/rbt_test.c b/bin/tests/rbt_test.c
index edf3d12d64..bad423f75a 100644
--- a/bin/tests/rbt_test.c
+++ b/bin/tests/rbt_test.c
@@ -129,7 +129,7 @@ detail(dns_rbt_t *rbt, dns_name_t *name) {
 	printf("\n");
 
 	result = dns_rbt_findnode(rbt, name, foundname, &node1, &chain,
-				  ISC_TRUE, NULL, NULL);
+				  DNS_RBTFIND_EMPTYDATA, NULL, NULL);
 
 	switch (result) {
 	case ISC_R_SUCCESS:
@@ -372,7 +372,7 @@ main (int argc, char **argv) {
 						dns_fixedname_name(&fixedname);
 					data = NULL;
 
-					result = dns_rbt_findname(rbt, name,
+					result = dns_rbt_findname(rbt, name, 0,
 								  foundname,
 								  &data);
 					switch (result) {
diff --git a/lib/dns/compress.c b/lib/dns/compress.c
index 238dc0283b..b2d00cfe68 100644
--- a/lib/dns/compress.c
+++ b/lib/dns/compress.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: compress.c,v 1.24 2000/04/12 21:25:10 tale Exp $ */
+/* $Id: compress.c,v 1.25 2000/04/19 18:23:29 halley Exp $ */
 
 #include <config.h>
 #include <string.h>
@@ -339,7 +339,7 @@ compress_find(dns_rbt_t *root, dns_name_t *name, dns_name_t *prefix,
 
 	dns_fixedname_init(&found);
 	foundname = dns_fixedname_name(&found);
-	result = dns_rbt_findname(root, name, foundname, (void *)&data);
+	result = dns_rbt_findname(root, name, 0, foundname, (void *)&data);
 	if (result != ISC_R_SUCCESS && result != DNS_R_PARTIALMATCH)
 		return (ISC_FALSE);
 	if (data == NULL)		/* root label */
diff --git a/lib/dns/dbtable.c b/lib/dns/dbtable.c
index df3fe9e61c..b7cf4040ad 100644
--- a/lib/dns/dbtable.c
+++ b/lib/dns/dbtable.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dbtable.c,v 1.14 2000/04/06 22:01:53 explorer Exp $
+ * $Id: dbtable.c,v 1.15 2000/04/19 18:23:30 halley Exp $
  */
 
 /*
@@ -220,7 +220,7 @@ dns_dbtable_remove(dns_dbtable_t *dbtable, dns_db_t *db) {
 
 	RWLOCK(&dbtable->tree_lock, isc_rwlocktype_write);
 
-	result = dns_rbt_findname(dbtable->rbt, name, NULL,
+	result = dns_rbt_findname(dbtable->rbt, name, 0, NULL,
 				  (void **)&stored_data);
 
 	if (result == ISC_R_SUCCESS) {
@@ -278,7 +278,7 @@ dns_dbtable_find(dns_dbtable_t *dbtable, dns_name_t *name, dns_db_t **dbp) {
 
 	RWLOCK(&dbtable->tree_lock, isc_rwlocktype_read);
 
-	result = dns_rbt_findname(dbtable->rbt, name, NULL,
+	result = dns_rbt_findname(dbtable->rbt, name, 0, NULL,
 				  (void **)&stored_data);
 
 	if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH)
diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c
index fafbec1ad4..20dab76025 100644
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -261,7 +261,7 @@ dns_keytable_findkeynode(dns_keytable_t *keytable, dns_name_t *name,
 
 	knode = NULL;
 	data = NULL;
-	result = dns_rbt_findname(keytable->table, name, NULL, &data);
+	result = dns_rbt_findname(keytable->table, name, 0, NULL, &data);
 
 	if (result == ISC_R_SUCCESS) {
 		INSIST(data != NULL);
@@ -305,7 +305,7 @@ dns_keytable_finddeepestmatch(dns_keytable_t *keytable, dns_name_t *name,
 
 	knode = NULL;
 	data = NULL;
-	result = dns_rbt_findname(keytable->table, name, foundname, &data);
+	result = dns_rbt_findname(keytable->table, name, 0, foundname, &data);
 
 	if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH)
 		result = ISC_R_SUCCESS;
@@ -352,7 +352,7 @@ dns_keytable_issecuredomain(dns_keytable_t *keytable, dns_name_t *name,
 	RWLOCK(&keytable->rwlock, isc_rwlocktype_read);
 
 	data = NULL;
-	result = dns_rbt_findname(keytable->table, name, NULL, &data);
+	result = dns_rbt_findname(keytable->table, name, 0, NULL, &data);
 
 	if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
 		INSIST(data != NULL);