Merge branch 'upstream' into debian

1 files changed, 28 insertions, 15 deletions

diff --git a/Completion/Unix/Command/_dig b/Completion/Unix/Command/_dig
index 3081e2cfd..440c5de90 100644
--- a/Completion/Unix/Command/_dig
+++ b/Completion/Unix/Command/_dig
@@ -5,9 +5,10 @@ local -a alts args
 [[ -prefix + ]] && args=(
   '*+'{no,}'tcp[use TCP instead of UDP for queries]'
   '*+'{no,}'ignore[ignore truncation in UDP responses]'
-  '*+domain=[set search list to single domain]:domain:_hosts'
-  '*+dscp=[set DSCP code point for query]:code point (0..63)'
+  '*+domain=-[set search list to single domain]:domain:_hosts'
+  '!*+dscp=-:code point (0..63)'
   '*+'{no,}'search[use search list defined in resolv.conf]'
+  '!*+'{no,}defname
   '*+'{no,}'showsearch[show intermediate results in domain search]'
   '*+split[split hex/base64 fields into chunks]:width (characters) [56]'
   '*+'{no,}'aaonly[set aa flag in the query]'
@@ -18,31 +19,39 @@ local -a alts args
   '*+'{no,}'class[display the CLASS whening printing the record]'
   '*+'{no,}'cookie[add a COOKIE option to the request]'
   '*+'{no,}'crypto[display cryptographic fields in DNSSEC records]'
-  '*+edns=[specify EDNS version for query]:version (0-255)'
+  '*+'{no,}'dns64prefix[get the DNS64 prefixes from ipv4only.arpa]'
+  '*+edns=-[specify EDNS version for query]:version (0-255)'
   '*+noedns[clear EDNS version to be sent]'
-  '*+ednsflags=[set EDNS flags bits]:flags'
+  '*+ednsflags=-[set EDNS flags bits]:flags'
   '*+'{no,}'ednsnegotiation[set EDNS version negotiation]'
-  '*+ednsopt=[specify EDNS option]:code point'
+  '*+ednsopt=-[specify EDNS option]:code point'
   '*+noedns[clear EDNS options to be sent]'
   '*+'{no,}'expandaaaa[expand AAAA records]'
   '*+'{no,}'expire[send an EDNS Expire option]'
   '*+'{no,}'header-only[send query without a question section]'
-  '*+'{no,}'idnin[set processing of IDN domain names on input]'
-  '*+'{no,}'idnout[set conversion of IDN puny code on output]'
+  '*+'{no,}'https=-[DNS-over-HTTPS POST mode]::endpoint [/dns-query]'
+  '!*+'{no,}'https-post=-::endpoint [/dns-query]'
+  '*+'{no,}'https-get=-[DNS-over-HTTPS GET mode]::endpoint [/dns-query]'
+  '*+'{no,}'http-plain=-[DNS-over-HTTP POST mode]::endpoint [/dns-query]'
+  '*+'{no,}'http-plain-get=-[DNS-over-HTTP GET mode]::endpoint [/dns-query]'
+  '*+'{no,}'idn[convert international domain names]'
   '*+'{no,}'keepalive[request EDNS TCP keepalive]'
   '*+'{no,}'keepopen[keep TCP socket open between queries]'
-  '*+'{no,}'mapped[allow mapped IPv4 over IPv6 to be used]'
   '*+'{no,}'recurse[set the RD (recursion desired) bit in the query]'
   '*+'{no,}'nssearch[search all authoritative nameservers]'
-  '*+opcode[set DNS message opcode of the request]:opcode [QUERY]:(QUERY IQUERY STATUS NOTIFY UPDATE)'
+  '*+opcode=-[set DNS message opcode of the request]:opcode [QUERY]:(QUERY IQUERY STATUS NOTIFY UPDATE)'
   '*+noopcode[clear DNS message opcode]'
   '*+'{no,}'trace[trace delegation down from root]'
   '*+'{no,}'cmd[print initial comment in output]'
   '*+'{no,}'short[print terse output]'
+  '*+'{no,}'showbadcookie[show BADCOOKIE message]'
   '*+'{no,}'identify[print IP and port of responder]'
   '*+'{no,}'comments[print comment lines in output]'
   '*+'{no,}'stats[print statistics]'
   '*+padding[set padding block size]:size [0]'
+  '*+'{no,}'proxy=-[add PROXYv2 headers to queries]:src_addr[#src_port]-dst_addr[#dst_port]'
+  '*+'{no,}'proxy-plain=-[add PROXYv2 headers to queries ahead of any encryption]:src_addr[#src_port]-dst_addr[#dst_port]'
+  '*+qid=-[specify query ID]:query ID'
   '*+'{no,}'qr[print query as it was sent]'
   '*+'{no,}'question[print question section of a query]'
   '*+'{no,}'raflag[set RA flag in the query]'
@@ -51,12 +60,17 @@ local -a alts args
   '*+'{no,}'all[set all print/display flags]'
   '*+'{no,}'subnet[send EDNS client subnet option]:addr/prefix-length'
   '*+'{no,}'tcflag[set TC flag in the query]'
-  '*+timeout=[set query timeout]:timeout (seconds) [5]'
-  '*+tries=[specify number of UDP query attempts]:tries'
-  '*+retry=[specify number of UDP query retries]:retries'
+  '*+timeout=-[set query timeout]:timeout (seconds) [5]'
+  '*+'{no,}'tls[DNS-over-TLS mode]'
+  '*+'{no,}"tls-ca=-[enable remote server's TLS certificate validation]:file:_files"
+  '*+'{no,}"tls-hostname=-[explicitly set the expected TLS hostname]:hostname"
+  '*+'{no,}'tls-certfile=-[load client TLS certificate chain from file]:file:_files'
+  '*+'{no,}'tls-keyfile=-[load client TLS private key from file]:file:_files'
+  '*+tries=-[specify number of UDP query attempts]:tries'
+  '*+retry=-[specify number of UDP query retries]:retries'
   '*+'{no,}'rrcomments[set display of per-record comments]'
-  '*+ndots=[specify number of dots to be considered absolute]:dots'
-  '*+bufsize=[specify UDP buffer size]:size (bytes)'
+  '*+ndots=-[specify number of dots to be considered absolute]:dots'
+  '*+bufsize=-[specify UDP buffer size]:size (bytes)'
   '*+'{no,}'multiline[verbose multi-line output]'
   '*+'{no,}'onesoa[AXFR prints only one soa record]'
   '*+'{no,}"fail[don't try next server on SERVFAIL]"
@@ -65,7 +79,6 @@ local -a alts args
   '*+'{no,}'nsid[include EDNS name server ID request in query]'
   '*+'{no,}'ttlid[display the TTL whening printing the record]'
   '*+'{no,}'ttlunits[display the TTL in human-readable units]'
-  '*+'{no,}'unexpected[print replies from unexpected sources]'
   '*+'{no,}'unknownformat[print RDATA in RFC 3597 "unknown" format]'
   '*+'{no,}'yaml[present the results as YAML]'
   '*+'{no,}'zflag[set Z flag in query]'