From d580a3fa496a983f2d0d4a9b81d621af18628f13 Mon Sep 17 00:00:00 2001
From: Florian Obser <florian@cvs.openbsd.org>
Date: Wed, 14 Aug 2024 17:38:58 +0000
Subject: resdebug and no_tld_query are unused

---
 usr.bin/dig/lib/lwres/include/lwres/lwres.h |  4 +---
 usr.bin/dig/lib/lwres/lwconfig.c            | 10 +---------
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'usr.bin/dig/lib')

diff --git a/usr.bin/dig/lib/lwres/include/lwres/lwres.h b/usr.bin/dig/lib/lwres/include/lwres/lwres.h
index 86f56774636..62af04e5b6c 100644
--- a/usr.bin/dig/lib/lwres/include/lwres/lwres.h
+++ b/usr.bin/dig/lib/lwres/include/lwres/lwres.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwres.h,v 1.5 2024/08/14 17:37:40 florian Exp $ */
+/* $Id: lwres.h,v 1.6 2024/08/14 17:38:57 florian Exp $ */
 
 #ifndef LWRES_LWRES_H
 #define LWRES_LWRES_H 1
@@ -114,9 +114,7 @@ typedef struct {
 	char 	       *search[LWRES_CONFMAXSEARCH];
 	uint8_t	searchnxt;	/*%< index for next free slot */
 
-	uint8_t	resdebug;      /*%< non-zero if 'options debug' set */
 	uint8_t	ndots;	       /*%< set to n in 'options ndots:n' */
-	uint8_t	no_tld_query;  /*%< non-zero if 'options no_tld_query' */
 	int	flags;
 } lwres_conf_t;
 
diff --git a/usr.bin/dig/lib/lwres/lwconfig.c b/usr.bin/dig/lib/lwres/lwconfig.c
index fd8fbf1497b..8bc130ca099 100644
--- a/usr.bin/dig/lib/lwres/lwconfig.c
+++ b/usr.bin/dig/lib/lwres/lwconfig.c
@@ -155,9 +155,7 @@ lwres_conf_init(lwres_conf_t *confdata, int lwresflags) {
 	confdata->nsnext = 0;
 	confdata->domainname = NULL;
 	confdata->searchnxt = 0;
-	confdata->resdebug = 0;
 	confdata->ndots = 1;
-	confdata->no_tld_query = 0;
 	confdata->flags = lwresflags;
 
 	for (i = 0; i < LWRES_CONFMAXNAMESERVERS; i++)
@@ -187,9 +185,7 @@ lwres_conf_clear(lwres_conf_t *confdata) {
 	confdata->nsnext = 0;
 	confdata->domainname = NULL;
 	confdata->searchnxt = 0;
-	confdata->resdebug = 0;
 	confdata->ndots = 1;
-	confdata->no_tld_query = 0;
 }
 
 static lwres_result_t
@@ -366,11 +362,7 @@ lwres_conf_parseoption(lwres_conf_t *confdata,  FILE *fp) {
 		return (LWRES_R_FAILURE); /* Empty line after keyword. */
 
 	while (strlen(word) > 0U) {
-		if (strcmp("debug", word) == 0) {
-			confdata->resdebug = 1;
-		} else if (strcmp("no_tld_query", word) == 0) {
-			confdata->no_tld_query = 1;
-		} else if (strncmp("ndots:", word, 6) == 0) {
+		if (strncmp("ndots:", word, 6) == 0) {
 			ndots = strtol(word + 6, &p, 10);
 			if (*p != '\0') /* Bad string. */
 				return (LWRES_R_FAILURE);
-- 
cgit v1.2.3