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

minor bugfix in mdig: when using +multi, +norrcomments was ignored

Browse Source
This commit is contained in:
Evan Hunt 2019-07-30 12:28:20 -07:00
parent 5d5cf12a85
commit edab51b420
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/tools/mdig.c
View File

@ -94,7 +94,7 @@ static bool besteffort = true;
static bool display_short_form = false; static bool display_short_form = false;
static bool display_headers = true; static bool display_headers = true;
static bool display_comments = true; static bool display_comments = true;
static bool display_rrcomments = true; static int display_rrcomments = 0;
static bool display_ttlunits = true; static bool display_ttlunits = true;
static bool display_ttl = true; static bool display_ttl = true;
static bool display_class = true; static bool display_class = true;
@ -247,7 +247,7 @@ recvresponse(isc_task_t *task, isc_event_t *event) {
styleflags |= DNS_STYLEFLAG_COMMENT; styleflags |= DNS_STYLEFLAG_COMMENT;
if (display_unknown_format) if (display_unknown_format)
styleflags |= DNS_STYLEFLAG_UNKNOWNFORMAT; styleflags |= DNS_STYLEFLAG_UNKNOWNFORMAT;
if (display_rrcomments) if (display_rrcomments > 0)
styleflags |= DNS_STYLEFLAG_RRCOMMENT; styleflags |= DNS_STYLEFLAG_RRCOMMENT;
if (display_ttlunits) if (display_ttlunits)
styleflags |= DNS_STYLEFLAG_TTL_UNITS; styleflags |= DNS_STYLEFLAG_TTL_UNITS;
@ -265,7 +265,10 @@ recvresponse(isc_task_t *task, isc_event_t *event) {
styleflags |= DNS_STYLEFLAG_TTL; styleflags |= DNS_STYLEFLAG_TTL;
styleflags |= DNS_STYLEFLAG_MULTILINE; styleflags |= DNS_STYLEFLAG_MULTILINE;
styleflags |= DNS_STYLEFLAG_COMMENT; styleflags |= DNS_STYLEFLAG_COMMENT;
styleflags |= DNS_STYLEFLAG_RRCOMMENT; /* Turn on rrcomments unless explicitly disabled */
if (display_rrcomments >= 0) {
styleflags |= DNS_STYLEFLAG_RRCOMMENT;
}
} }
if (display_multiline || (!display_ttl && !display_class)) if (display_multiline || (!display_ttl && !display_class))
result = dns_master_stylecreate(&style, styleflags, result = dns_master_stylecreate(&style, styleflags,
@ -1100,7 +1103,7 @@ plus_option(char *option, struct query *query, bool global)
display_authority = state; display_authority = state;
display_additional = state; display_additional = state;
display_comments = state; display_comments = state;
display_rrcomments = state; display_rrcomments = state ? 1 : -1;
break; break;
case 'n': /* answer */ case 'n': /* answer */
FULLCHECK("answer"); FULLCHECK("answer");
@ -1349,7 +1352,7 @@ plus_option(char *option, struct query *query, bool global)
case 'r': case 'r':
FULLCHECK("rrcomments"); FULLCHECK("rrcomments");
GLOBAL(); GLOBAL();
display_rrcomments = state; display_rrcomments = state ? 1 : -1;
break; break;
default: default:
goto invalid_option; goto invalid_option;
@ -1367,7 +1370,7 @@ plus_option(char *option, struct query *query, bool global)
display_authority = false; display_authority = false;
display_additional = false; display_additional = false;
display_comments = false; display_comments = false;
display_rrcomments = false; display_rrcomments = -1;
} }
break; break;
case 'p': /* split */ case 'p': /* split */