diff --git a/CHANGES b/CHANGES index 8cfb5133d8..5e72338766 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +4159. [cleanup] Alphabetize dig's help output. [RT #39966] + 4158. [placeholder] 4157. [placeholder] @@ -21,7 +23,7 @@ 4152. [func] Implement DNS COOKIE option. This replaces the experimental SIT option of BIND 9.10. The following - named.conf directives are avaliable: send-cookie, + named.conf directives are available: send-cookie, cookie-secret, cookie-algorithm and nocookie-udp-size. The following dig options are available: +[no]cookie[=value] and +[no]badcookie. [RT #39928] diff --git a/bin/dig/dig.c b/bin/dig/dig.c index 6cd7cd7f31..930fe3a167 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -144,87 +144,90 @@ help(void) { " q-type is one of (a,any,mx,ns,soa,hinfo,axfr,txt,...) [default:a]\n" " (Use ixfr=version for type ixfr)\n" " q-opt is one of:\n" -" -x dot-notation (shortcut for reverse lookups)\n" -" -i (use IP6.INT for IPv6 reverse lookups)\n" -" -f filename (batch mode)\n" +" -4 (use IPv4 query transport only)\n" +" -6 (use IPv6 query transport only)\n" " -b address[#port] (bind to source address/port)\n" +" -c class (specify query class)\n" +" -f filename (batch mode)\n" +" -i (use IP6.INT for IPv6 reverse lookups)\n" +" -k keyfile (specify tsig key file)\n" +" -m (enable memory usage debugging)\n" " -p port (specify port number)\n" " -q name (specify query name)\n" " -t type (specify query type)\n" -" -c class (specify query class)\n" " -u (display times in usec instead of msec)\n" -" -k keyfile (specify tsig key file)\n" +" -x dot-notation (shortcut for reverse lookups)\n" " -y [hmac:]name:key (specify named base64 tsig key)\n" -" -4 (use IPv4 query transport only)\n" -" -6 (use IPv6 query transport only)\n" -" -m (enable memory usage debugging)\n" " d-opt is of the form +keyword[=value], where keyword is:\n" -" +[no]vc (TCP mode)\n" -" +[no]tcp (TCP mode, alternate syntax)\n" -" +timeout=### (Set query timeout) [5]\n" -" +tries=### (Set number of UDP attempts) [3]\n" -" +retry=### (Set number of UDP retries) [2]\n" -" +domain=### (Set default domainname)\n" -" +bufsize=### (Set EDNS0 Max UDP packet size)\n" -" +ndots=### (Set NDOTS value)\n" -" +subnet=addr (Set edns-client-subnet option)\n" -" +[no]edns[=###] (Set EDNS version) [0]\n" -" +ednsflags=### (Set EDNS flag bits)\n" -" +ednsopt=###[:value] (Send specified EDNS option)\n" -" +noednsopt (Clear list of +ednsopt options)\n" -" +[no]ednsnegotiation (Set EDNS version negotiation)\n" -" +[no]search (Set whether to use searchlist)\n" -" +[no]showsearch (Search with intermediate results)\n" -" +[no]defname (Ditto)\n" -" +[no]recurse (Recursive mode)\n" -" +[no]ignore (Don't revert to TCP for TC responses.)" -"\n" -" +[no]fail (Don't try next server on SERVFAIL)\n" -" +[no]besteffort (Try to parse even illegal messages)\n" +" +[no]aaflag (Set AA flag in query (+[no]aaflag))\n" " +[no]aaonly (Set AA flag in query (+[no]aaflag))\n" -" +[no]adflag (Set AD flag in query)\n" -" +[no]cdflag (Set CD flag in query)\n" -" +[no]zflag (Set Z flag in query)\n" -" +[no]cl (Control display of class in records)\n" +" +[no]adflag (Set AD flag in query (default on))\n" +" +[no]additional (Control display of additional section)\n" +" +[no]all (Set or clear all display flags)\n" +" +[no]answer (Control display of answer section)\n" +" +[no]authority (Control display of authority section)\n" +" +[no]badcookie (Retry BADCOOKIE responses)\n" +" +[no]besteffort (Try to parse even illegal messages)\n" +" +bufsize=### (Set EDNS0 Max UDP packet size)\n" +" +[no]cdflag (Set checking disabled flag in query)\n" +" +[no]class (Control display of class in records)\n" " +[no]cmd (Control display of command line)\n" " +[no]comments (Control display of comment lines)\n" -" +[no]rrcomments (Control display of per-record " - "comments)\n" +" +[no]cookie (Add a COOKIE option to the request)\n" " +[no]crypto (Control display of cryptographic " "fields in records)\n" -" +[no]question (Control display of question)\n" -" +[no]answer (Control display of answer)\n" -" +[no]authority (Control display of authority)\n" -" +[no]additional (Control display of additional)\n" -" +[no]stats (Control display of statistics)\n" -" +[no]short (Disable everything except short\n" -" form of answer)\n" -" +[no]ttlid (Control display of ttls in records)\n" -" +[no]ttlunits (Display TTLs in human-readable units)\n" -" +[no]all (Set or clear all display flags)\n" -" +[no]qr (Print question before sending)\n" -" +[no]nssearch (Search all authoritative nameservers)\n" -" +[no]identify (ID responders in short answers)\n" -" +[no]trace (Trace delegation down from root [+dnssec])\n" +" +[no]defname (Use search list (+[no]search))\n" " +[no]dnssec (Request DNSSEC records)\n" +" +domain=### (Set default domainname)\n" +" +[no]dscp[=###] (Set the DSCP value to ### [0..63])\n" +" +[no]edns[=###] (Set EDNS version) [0]\n" +" +ednsflags=### (Set EDNS flag bits)\n" +" +[no]ednsnegotiation (Set EDNS version negotiation)\n" +" +ednsopt=###[:value] (Send specified EDNS option)\n" +" +noednsopt (Clear list of +ednsopt options)\n" " +[no]expire (Request time to expire)\n" -" +[no]nsid (Request Name Server ID)\n" +" +[no]fail (Don't try next server on SERVFAIL)\n" " +[no]header-only (Send query without a question section)\n" -" +[no]badcookie (Retry BADCOOKIE responses)\n" -" +[no]cookie (Add a COOKIE option to the request)\n" +" +[no]identify (ID responders in short answers)\n" +" +[no]ignore (Don't revert to TCP for TC responses.)\n" +" +[no]keepopen (Keep the TCP socket open between queries)\n" +" +[no]multiline (Print records in an expanded format)\n" +" +ndots=### (Set search NDOTS value)\n" +" +[no]nsid (Request Name Server ID)\n" +" +[no]nssearch (Search all authoritative nameservers)\n" +" +[no]onesoa (AXFR prints only one soa record)\n" +" +[no]opcode[###] (Set the opcode of the request)\n" +" +[no]qr (Print question before sending)\n" +" +[no]question (Control display of question section)\n" +" +[no]rdflag (Recursive mode (+[no]recurse))\n" +" +[no]recurse (Recursive mode (+[no]rdflag))\n" +" +retry=### (Set number of UDP retries) [2]\n" +" +[no]rrcomments (Control display of per-record " + "comments)\n" +" +[no]search (Set whether to use searchlist)\n" +" +[no]short (Display nothing except short\n" +" form of answer)\n" +" +[no]showsearch (Search with intermediate results)\n" #ifdef DIG_SIGCHASE " +[no]sigchase (Chase DNSSEC signatures)\n" -" +trusted-key=#### (Trusted Key when chasing DNSSEC sigs)\n" -#if DIG_SIGCHASE_TD -" +[no]topdown (Do DNSSEC validation top down mode)\n" -#endif #endif " +[no]split=## (Split hex/base64 fields into chunks)\n" -" +[no]multiline (Print records in an expanded format)\n" -" +[no]onesoa (AXFR prints only one soa record)\n" -" +[no]keepopen (Keep the TCP socket open between queries)\n" -" +[no]dscp[=###] (Set the DSCP value to ### [0..63])\n" -" +[no]opcode[###] (Set the opcode of the request)\n" +" +[no]stats (Control display of statistics)\n" +" +subnet=addr (Set edns-client-subnet option)\n" +" +[no]tcp (TCP mode (+[no]vc))\n" +" +timeout=### (Set query timeout) [5]\n" +#if defined(DIG_SIGCHASE) && DIG_SIGCHASE_TD +" +[no]topdown (Do +sigchase in top-down mode)\n" +#endif +" +[no]trace (Trace delegation down from root [+dnssec])\n" +#ifdef DIG_SIGCHASE +" +trusted-key=#### (Trusted Key to use with +sigchase)\n" +#endif +" +tries=### (Set number of UDP attempts) [3]\n" +" +[no]ttlid (Control display of ttls in records)\n" +" +[no]ttlunits (Display TTLs in human-readable units)\n" +" +[no]vc (TCP mode (+[no]tcp))\n" +" +[no]zflag (Set Z flag in query)\n" " global d-opts and servers (before host name) affect all queries.\n" " local d-opts and servers (after host name) affect only that lookup.\n" " -h (print help and exit)\n"