mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

Remove +details option

Browse Source
This commit is contained in:
Michael Sawyer 2000-09-27 00:02:02 +00:00
parent ab38df2af4
commit 056aaae3e2
4 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bin/dig/dig.c
View File

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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 <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
@ -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; usesearch, qr;
extern in_port_t port; extern in_port_t port;
extern unsigned int timeout; extern unsigned int timeout;
@ -164,7 +164,6 @@ show_usage(void) {
" +[no]aaonly (Set AA flag in query)\n" " +[no]aaonly (Set AA flag in query)\n"
" +[no]adflag (Set AD flag in query)\n" " +[no]adflag (Set AD flag in query)\n"
" +[no]cdflag (Set CD 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" " +ndots=### (Set NDOTS value)\n"
" +[no]comments (Control display of comment lines)\n" " +[no]comments (Control display of comment lines)\n"
" +[no]question (Control display of question)\n" " +[no]question (Control display of question)\n"
@ -649,16 +648,7 @@ plus_option(char *option, isc_boolean_t is_batchfile,
case 'd': case 'd':
switch (tolower(cmd[1])) { switch (tolower(cmd[1])) {
case 'e': case 'e':
switch (tolower(cmd[2])) { lookup->defname = state;
case 'f': /* defname */
lookup->defname = state;
break;
case 't': /* details */
show_details = state;
break;
default:
goto invalid_option;
}
break; break;
case 'o': /* domain */ case 'o': /* domain */
if (value == NULL) if (value == NULL)
@ -800,7 +790,6 @@ plus_option(char *option, isc_boolean_t is_batchfile,
lookup->section_additional = ISC_FALSE; lookup->section_additional = ISC_FALSE;
lookup->section_authority = ISC_TRUE; lookup->section_authority = ISC_TRUE;
lookup->section_question = ISC_FALSE; lookup->section_question = ISC_FALSE;
show_details = ISC_TRUE;
} }
break; break;
case 'i': /* tries */ case 'i': /* tries */

13
bin/dig/dighost.c
View File

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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 * 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, specified_source = ISC_FALSE,
free_now = ISC_FALSE, free_now = ISC_FALSE,
cancel_now = ISC_FALSE, cancel_now = ISC_FALSE,
show_details = ISC_FALSE,
usesearch = ISC_FALSE, usesearch = ISC_FALSE,
qr = ISC_FALSE, qr = ISC_FALSE,
is_dst_up = ISC_FALSE, is_dst_up = ISC_FALSE,
@ -2265,12 +2264,7 @@ recv_done(isc_task_t *task, isc_event_t *event) {
if ((l->trace)|| if ((l->trace)||
(l->ns_search_only)) { (l->ns_search_only)) {
debug("in TRACE code"); debug("in TRACE code");
if (show_details || printmessage(query, msg, ISC_TRUE);
(((dns_message_firstname(msg,
DNS_SECTION_ANSWER)
== ISC_R_SUCCESS)) &&
!l->trace_root))
printmessage(query, msg, ISC_TRUE);
if ((msg->rcode != 0) && if ((msg->rcode != 0) &&
(l->origin != NULL)) { (l->origin != NULL)) {
if (!next_origin(msg, query)) { if (!next_origin(msg, query)) {
@ -2312,9 +2306,6 @@ recv_done(isc_task_t *task, isc_event_t *event) {
(char *)r.base, (char *)r.base,
query); query);
} }
if (show_details) {
printmessage(query, msg, ISC_TRUE);
}
} else { } else {
if (query->first_soa_rcvd && if (query->first_soa_rcvd &&
l->doing_xfr) l->doing_xfr)

7
bin/dig/host.c
View File

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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 <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
@ -45,7 +45,7 @@ extern ISC_LIST(dig_lookup_t) lookup_list;
extern ISC_LIST(dig_server_t) server_list; extern ISC_LIST(dig_server_t) server_list;
extern ISC_LIST(dig_searchlist_t) search_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 unsigned int timeout;
extern isc_mem_t *mctx; extern isc_mem_t *mctx;
extern int ndots; extern int ndots;
@ -235,7 +235,7 @@ received(int bytes, int frmsize, char *frm, dig_query_t *query) {
isc_result_t result; isc_result_t result;
int diff; int diff;
if (!short_form || show_details) { if (!short_form) {
result = isc_time_now(&now); result = isc_time_now(&now);
check_result(result, "isc_time_now"); check_result(result, "isc_time_now");
diff = isc_time_microdiff(&now, &query->time_sent); 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->rdclass = dns_rdataclass_in;
lookup->ns_search_only = ISC_TRUE; lookup->ns_search_only = ISC_TRUE;
lookup->trace_root = ISC_TRUE; lookup->trace_root = ISC_TRUE;
show_details = ISC_TRUE;
break; break;
case 'N': case 'N':
debug("setting NDOTS to %s", debug("setting NDOTS to %s",

4
bin/dig/nslookup.c
View File

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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 <config.h> #include <config.h>
@ -45,7 +45,7 @@ extern ISC_LIST(dig_lookup_t) lookup_list;
extern ISC_LIST(dig_server_t) server_list; extern ISC_LIST(dig_server_t) server_list;
extern ISC_LIST(dig_searchlist_t) search_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; usesearch, trace, qr, debugging;
extern in_port_t port; extern in_port_t port;
extern unsigned int timeout; extern unsigned int timeout;