From 056aaae3e2399b2c1df8f82be52d9bd43ceda50c Mon Sep 17 00:00:00 2001 From: Michael Sawyer Date: Wed, 27 Sep 2000 00:02:02 +0000 Subject: [PATCH] Remove +details option --- bin/dig/dig.c | 17 +++-------------- bin/dig/dighost.c | 13 ++----------- bin/dig/host.c | 7 +++---- bin/dig/nslookup.c | 4 ++-- 4 files changed, 10 insertions(+), 31 deletions(-) diff --git a/bin/dig/dig.c b/bin/dig/dig.c index fa1414bb0c..53819adde3 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dig.c,v 1.103 2000/09/26 17:17:39 gson Exp $ */ +/* $Id: dig.c,v 1.104 2000/09/27 00:01:58 mws Exp $ */ #include #include @@ -51,7 +51,7 @@ extern ISC_LIST(dig_searchlist_t) search_list; } -extern isc_boolean_t have_ipv6, show_details, specified_source, +extern isc_boolean_t have_ipv6, specified_source, usesearch, qr; extern in_port_t port; extern unsigned int timeout; @@ -164,7 +164,6 @@ show_usage(void) { " +[no]aaonly (Set AA flag in query)\n" " +[no]adflag (Set AD flag in query)\n" " +[no]cdflag (Set CD flag in query)\n" -" +[no]details (Show details of all requests)\n" " +ndots=### (Set NDOTS value)\n" " +[no]comments (Control display of comment lines)\n" " +[no]question (Control display of question)\n" @@ -649,16 +648,7 @@ plus_option(char *option, isc_boolean_t is_batchfile, case 'd': switch (tolower(cmd[1])) { case 'e': - switch (tolower(cmd[2])) { - case 'f': /* defname */ - lookup->defname = state; - break; - case 't': /* details */ - show_details = state; - break; - default: - goto invalid_option; - } + lookup->defname = state; break; case 'o': /* domain */ if (value == NULL) @@ -800,7 +790,6 @@ plus_option(char *option, isc_boolean_t is_batchfile, lookup->section_additional = ISC_FALSE; lookup->section_authority = ISC_TRUE; lookup->section_question = ISC_FALSE; - show_details = ISC_TRUE; } break; case 'i': /* tries */ diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index d635627cbf..a219a041d8 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.135 2000/09/26 17:21:25 mws Exp $ */ +/* $Id: dighost.c,v 1.136 2000/09/27 00:02:00 mws Exp $ */ /* * Notice to programmers: Do not use this code as an example of how to @@ -71,7 +71,6 @@ isc_boolean_t specified_source = ISC_FALSE, free_now = ISC_FALSE, cancel_now = ISC_FALSE, - show_details = ISC_FALSE, usesearch = ISC_FALSE, qr = ISC_FALSE, is_dst_up = ISC_FALSE, @@ -2265,12 +2264,7 @@ recv_done(isc_task_t *task, isc_event_t *event) { if ((l->trace)|| (l->ns_search_only)) { debug("in TRACE code"); - if (show_details || - (((dns_message_firstname(msg, - DNS_SECTION_ANSWER) - == ISC_R_SUCCESS)) && - !l->trace_root)) - printmessage(query, msg, ISC_TRUE); + printmessage(query, msg, ISC_TRUE); if ((msg->rcode != 0) && (l->origin != NULL)) { if (!next_origin(msg, query)) { @@ -2312,9 +2306,6 @@ recv_done(isc_task_t *task, isc_event_t *event) { (char *)r.base, query); } - if (show_details) { - printmessage(query, msg, ISC_TRUE); - } } else { if (query->first_soa_rcvd && l->doing_xfr) diff --git a/bin/dig/host.c b/bin/dig/host.c index d7d8bfdebd..aa05462b6c 100644 --- a/bin/dig/host.c +++ b/bin/dig/host.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: host.c,v 1.53 2000/09/13 00:27:24 mws Exp $ */ +/* $Id: host.c,v 1.54 2000/09/27 00:02:01 mws Exp $ */ #include #include @@ -45,7 +45,7 @@ extern ISC_LIST(dig_lookup_t) lookup_list; extern ISC_LIST(dig_server_t) server_list; extern ISC_LIST(dig_searchlist_t) search_list; -extern isc_boolean_t show_details, debugging; +extern isc_boolean_t debugging; extern unsigned int timeout; extern isc_mem_t *mctx; extern int ndots; @@ -235,7 +235,7 @@ received(int bytes, int frmsize, char *frm, dig_query_t *query) { isc_result_t result; int diff; - if (!short_form || show_details) { + if (!short_form) { result = isc_time_now(&now); check_result(result, "isc_time_now"); diff = isc_time_microdiff(&now, &query->time_sent); @@ -624,7 +624,6 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) { lookup->rdclass = dns_rdataclass_in; lookup->ns_search_only = ISC_TRUE; lookup->trace_root = ISC_TRUE; - show_details = ISC_TRUE; break; case 'N': debug("setting NDOTS to %s", diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index 39c4cc95a4..eb50920484 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nslookup.c,v 1.54 2000/09/22 17:14:24 mws Exp $ */ +/* $Id: nslookup.c,v 1.55 2000/09/27 00:02:02 mws Exp $ */ #include @@ -45,7 +45,7 @@ extern ISC_LIST(dig_lookup_t) lookup_list; extern ISC_LIST(dig_server_t) server_list; extern ISC_LIST(dig_searchlist_t) search_list; -extern isc_boolean_t have_ipv6, show_details, +extern isc_boolean_t have_ipv6, usesearch, trace, qr, debugging; extern in_port_t port; extern unsigned int timeout;