From: Evan Hunt <each@isc.org>
Date: Wed, 7 Aug 2019 18:51:13 +0000 (-0700)
Subject: remove DLV from dns_client API and lib/samples
X-Git-Tag: v9.15.3~3^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a73350a2108f101507d93d8cddf7f195eddaac10;p=thirdparty%2Fbind9.git

remove DLV from dns_client API and lib/samples
---

diff --git a/lib/dns/client.c b/lib/dns/client.c
index 8e765d989f1..96d45093bbd 100644
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -706,46 +706,6 @@ dns_client_clearservers(dns_client_t *client, dns_rdataclass_t rdclass,
 	return (result);
 }
 
-isc_result_t
-dns_client_setdlv(dns_client_t *client, dns_rdataclass_t rdclass,
-		  const char *dlvname)
-{
-	isc_result_t result;
-	isc_buffer_t b;
-	dns_view_t *view = NULL;
-
-	REQUIRE(DNS_CLIENT_VALID(client));
-
-	LOCK(&client->lock);
-	result = dns_viewlist_find(&client->viewlist, DNS_CLIENTVIEW_NAME,
-				   rdclass, &view);
-	UNLOCK(&client->lock);
-	if (result != ISC_R_SUCCESS)
-		goto cleanup;
-
-	if (dlvname == NULL)
-		view->dlv = NULL;
-	else {
-		dns_name_t *newdlv;
-
-		isc_buffer_constinit(&b, dlvname, strlen(dlvname));
-		isc_buffer_add(&b, strlen(dlvname));
-		newdlv = dns_fixedname_name(&view->dlv_fixed);
-		result = dns_name_fromtext(newdlv, &b, dns_rootname,
-					   DNS_NAME_DOWNCASE, NULL);
-		if (result != ISC_R_SUCCESS)
-			goto cleanup;
-
-		view->dlv = dns_fixedname_name(&view->dlv_fixed);
-	}
-
- cleanup:
-	if (view != NULL)
-		dns_view_detach(&view);
-
-	return (result);
-}
-
 static isc_result_t
 getrdataset(isc_mem_t *mctx, dns_rdataset_t **rdatasetp) {
 	dns_rdataset_t *rdataset;
diff --git a/lib/dns/include/dns/client.h b/lib/dns/include/dns/client.h
index b0ed77c97ed..d661e2deba6 100644
--- a/lib/dns/include/dns/client.h
+++ b/lib/dns/include/dns/client.h
@@ -271,26 +271,6 @@ dns_client_clearservers(dns_client_t *client, dns_rdataclass_t rdclass,
  *\li	Anything else				Failure.
  */
 
-isc_result_t
-dns_client_setdlv(dns_client_t *client, dns_rdataclass_t rdclass,
-		  const char *dlvname);
-/*%<
- * Specify a name to use for DNSSEC lookaside validation.
- * If a trusted key has been added for that name, then DLV will be
- * used during validation.  If 'dlvname' is NULL, then DLV will no
- * longer be used for this client.
- *
- * Requires:
- *
- *\li	'client' is a valid client.
- *
- * Returns:
- *
- *\li	#ISC_R_SUCCESS				On success.
- *
- *\li	Anything else				Failure.
- */
-
 isc_result_t
 dns_client_resolve(dns_client_t *client, const dns_name_t *name,
 		   dns_rdataclass_t rdclass, dns_rdatatype_t type,
diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in
index d1733f49a8a..f0645696c0a 100644
--- a/lib/dns/win32/libdns.def.in
+++ b/lib/dns/win32/libdns.def.in
@@ -147,7 +147,6 @@ dns_client_freeupdate
 dns_client_mctx
 dns_client_request
 dns_client_resolve
-dns_client_setdlv
 dns_client_setservers
 dns_client_startrequest
 dns_client_startresolve
diff --git a/lib/samples/Makefile-postinstall.in b/lib/samples/Makefile-postinstall.in
index 8992ced646e..f87f4c93d9e 100644
--- a/lib/samples/Makefile-postinstall.in
+++ b/lib/samples/Makefile-postinstall.in
@@ -24,14 +24,13 @@ LIBS =		${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
 SUBDIRS =
 
 TARGETS =	sample@EXEEXT@ sample-async@EXEEXT@ sample-gai@EXEEXT@ \
-		sample-update@EXEEXT@ sample-request@EXEEXT@ nsprobe@EXEEXT@ \
-		dlvchecks@EXEEXT@
+		sample-update@EXEEXT@ sample-request@EXEEXT@ nsprobe@EXEEXT@
 
 OBJS =		sample.@O@ sample-async.@O@ sample-gai.@O@ sample-update.@O@ \
-		sample-request.@O@ nsprobe.@O@ dlvchecks.@O@
+		sample-request.@O@ nsprobe.@O@
 
 SRCS =		sample.c sample-async.c sample-gai.c sample-update.c \
-		sample-request.c nsprobe.c dlvchecks..c
+		sample-request.c nsprobe.c
 
 @BIND9_MAKE_RULES@
 
@@ -63,9 +62,5 @@ nsprobe@EXEEXT@: nsprobe.@O@ ${DEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 	nsprobe.@O@ ${LIBS}
 
-dlvchecks@EXEEXT@: dlvchecks.@O@ ${DEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-	dlvchecks.@O@ ${LIBS}
-
 clean distclean maintainer-clean::
 	rm -f ${TARGETS}