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

3561. [bug] dig: issue a warning if an EDNS query returns FORMERR

Browse Source 
or NOTIMP.  Adjust usage message. [RT #33363]
This commit is contained in:
Mark Andrews
2013-05-01 14:53:16 +10:00
parent c218f119cd
commit 93aba6dcec
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
3561. [bug] dig: issue a warning if an EDNS query returns FORMERR
or NOTIMP. Adjust usage message. [RT #33363]
3560. [bug] isc-config.sh did not honour includedir and libdir 3560. [bug] isc-config.sh did not honour includedir and libdir
when set via configure. [RT #33345] when set via configure. [RT #33345]

15
bin/dig/dig.c
View File

@@ -188,7 +188,7 @@ help(void) {
" +domain=### (Set default domainname)\n" " +domain=### (Set default domainname)\n"
" +bufsize=### (Set EDNS0 Max UDP packet size)\n" " +bufsize=### (Set EDNS0 Max UDP packet size)\n"
" +ndots=### (Set NDOTS value)\n" " +ndots=### (Set NDOTS value)\n"
" +edns=### (Set EDNS version) [0]\n" " +[no]edns[=###] (Set EDNS version) [0]\n"
" +[no]search (Set whether to use searchlist)\n" " +[no]search (Set whether to use searchlist)\n"
" +[no]showsearch (Search with intermediate results)\n" " +[no]showsearch (Search with intermediate results)\n"
" +[no]defname (Ditto)\n" " +[no]defname (Ditto)\n"
@@ -562,6 +562,13 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
printf(";; WARNING: recursion requested " printf(";; WARNING: recursion requested "
"but not available\n"); "but not available\n");
} }
if (msg != query->lookup->sendmsg &&
query->lookup->edns != -1 && msg->opt == NULL &&
(msg->rcode == dns_rcode_formerr ||
msg->rcode == dns_rcode_notimp))
printf("\n;; WARNING: EDNS query returned status "
"%s - retry with '+noedns'\n",
rcode_totext(msg->rcode));
if (msg != query->lookup->sendmsg && extrabytes != 0U) if (msg != query->lookup->sendmsg && extrabytes != 0U)
printf(";; WARNING: Messages has %u extra byte%s at " printf(";; WARNING: Messages has %u extra byte%s at "
"end\n", extrabytes, extrabytes != 0 ? "s" : ""); "end\n", extrabytes, extrabytes != 0 ? "s" : "");
@@ -893,8 +900,10 @@ plus_option(char *option, isc_boolean_t is_batchfile,
lookup->edns = -1; lookup->edns = -1;
break; break;
} }
if (value == NULL) if (value == NULL) {
goto need_value; lookup->edns = 0;
break;
}
result = parse_uint(&num, value, 255, "edns"); result = parse_uint(&num, value, 255, "edns");
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
fatal("Couldn't parse edns"); fatal("Couldn't parse edns");