From 7fc55ea79fde452a7ad5f8127eb331665f40dddc Mon Sep 17 00:00:00 2001
From: Bob Halley <source@isc.org>
Date: Fri, 21 Jan 2000 02:48:28 +0000
Subject: [PATCH] conform to resolver api changes

---
 lib/dns/byaddr.c | 6 ++----
 lib/dns/zone.c   | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c
index 9a23414512..550bee9538 100644
--- a/lib/dns/byaddr.c
+++ b/lib/dns/byaddr.c
@@ -253,8 +253,7 @@ byaddr_find(dns_byaddr_t *byaddr, dns_fetchevent_t *event) {
 		} else {
 			result = event->result;
 			fname = dns_fixedname_name(&event->foundname);
-			dns_resolver_destroyfetch(byaddr->view->resolver,
-						  &byaddr->fetch);
+			dns_resolver_destroyfetch(&byaddr->fetch);
 			INSIST(event->rdataset == &byaddr->rdataset);
 			INSIST(event->sigrdataset == NULL);
 			/*
@@ -459,8 +458,7 @@ dns_byaddr_cancel(dns_byaddr_t *byaddr) {
 		byaddr->canceled = ISC_TRUE;
 		if (byaddr->fetch != NULL) {
 			INSIST(byaddr->view != NULL);
-			dns_resolver_cancelfetch(byaddr->view->resolver,
-						 byaddr->fetch);
+			dns_resolver_cancelfetch(byaddr->fetch);
 		}
 	}
 
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 0e1e3ea803..12dd662aea 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: zone.c,v 1.57 2000/01/20 01:13:42 gson Exp $ */
+ /* $Id: zone.c,v 1.58 2000/01/21 02:48:28 halley Exp $ */
 
 #include <config.h>
 
@@ -344,7 +344,7 @@ zone_free(dns_zone_t *zone) {
 	if (zone->res != NULL)
 		dns_resolver_detach(&zone->res);
 	if (zone->fetch != NULL)
-		dns_resolver_destroyfetch(zone->res, &zone->fetch);
+		dns_resolver_destroyfetch(&zone->fetch);
 	if (zone->task != NULL)
 		isc_task_detach(&zone->task);
 	if (zone->socketmgr != NULL)