Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mpl/bind Merge conflicts and fix the build.



details:   https://anonhg.NetBSD.org/src/rev/3df7532287c0
branches:  trunk
changeset: 454117:3df7532287c0
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Sep 05 19:32:55 2019 +0000

description:
Merge conflicts and fix the build.

diffstat:

 external/mpl/bind/dist/Makefile.in                            |   10 +-
 external/mpl/bind/dist/bin/dig/dig.1                          |   28 +-
 external/mpl/bind/dist/bin/dig/dig.c                          |   33 +-
 external/mpl/bind/dist/bin/dig/dighost.c                      |   12 +-
 external/mpl/bind/dist/bin/named/bind9.xsl.h                  |  103 +-
 external/mpl/bind/dist/bin/named/config.c                     |   14 +-
 external/mpl/bind/dist/bin/named/fuzz.c                       |    4 +-
 external/mpl/bind/dist/bin/named/geoip.c                      |  146 +-
 external/mpl/bind/dist/bin/named/include/named/geoip.h        |   23 +-
 external/mpl/bind/dist/bin/named/include/named/globals.h      |    4 +-
 external/mpl/bind/dist/bin/named/named.conf.5                 |   30 +-
 external/mpl/bind/dist/bin/named/server.c                     |  239 +-
 external/mpl/bind/dist/bin/named/statschannel.c               |  185 ++-
 external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c     |    4 +-
 external/mpl/bind/dist/bin/named/win32/ntservice.c            |    4 +-
 external/mpl/bind/dist/bin/named/win32/os.c                   |    6 +-
 external/mpl/bind/dist/bin/named/zoneconf.c                   |   21 +-
 external/mpl/bind/dist/bin/pkcs11/pkcs11-keygen.c             |   53 +-
 external/mpl/bind/dist/bin/plugins/filter-aaaa.c              |   15 +-
 external/mpl/bind/dist/bin/rndc/rndc.8                        |    4 +-
 external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c  |    4 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/driver.c |    5 +-
 external/mpl/bind/dist/bin/tests/system/feature-test.c        |   11 +-
 external/mpl/bind/dist/bin/tests/system/wildcard/ns2/hints    |   11 -
 external/mpl/bind/dist/bin/tests/system/wildcard/ns3/hints    |   11 -
 external/mpl/bind/dist/bin/tests/system/wildcard/ns5/hints    |   11 -
 external/mpl/bind/dist/bin/tools/dnstap-read.c                |    3 +-
 external/mpl/bind/dist/bin/tools/mdig.c                       |   17 +-
 external/mpl/bind/dist/config.h.in                            |   21 +-
 external/mpl/bind/dist/configure                              |  806 +++++++++-
 external/mpl/bind/dist/contrib/dlz/modules/common/dlz_dbi.c   |    5 +-
 external/mpl/bind/dist/fuzz/dns_rdata_fromwire_text.c         |    2 +-
 external/mpl/bind/dist/lib/bind9/check.c                      |  199 ++-
 external/mpl/bind/dist/lib/dns/acl.c                          |   12 +-
 external/mpl/bind/dist/lib/dns/client.c                       |  146 +-
 external/mpl/bind/dist/lib/dns/dispatch.c                     |   14 +-
 external/mpl/bind/dist/lib/dns/dnstap.c                       |   11 +-
 external/mpl/bind/dist/lib/dns/gen-unix.h                     |   12 +-
 external/mpl/bind/dist/lib/dns/gen.c                          |   55 +-
 external/mpl/bind/dist/lib/dns/geoip2.c                       |    2 +-
 external/mpl/bind/dist/lib/dns/include/dns/acl.h              |   18 +-
 external/mpl/bind/dist/lib/dns/include/dns/clientinfo.h       |    6 +-
 external/mpl/bind/dist/lib/dns/include/dns/ecs.h              |    4 +-
 external/mpl/bind/dist/lib/dns/include/dns/geoip.h            |   56 +-
 external/mpl/bind/dist/lib/dns/include/dns/message.h          |    4 +-
 external/mpl/bind/dist/lib/dns/include/dns/resolver.h         |   13 +-
 external/mpl/bind/dist/lib/dns/include/dns/rpz.h              |    4 +-
 external/mpl/bind/dist/lib/dns/include/dns/stats.h            |   54 +-
 external/mpl/bind/dist/lib/dns/include/dns/types.h            |    3 +-
 external/mpl/bind/dist/lib/dns/include/dns/view.h             |   10 +-
 external/mpl/bind/dist/lib/dns/include/dns/zone.h             |   25 +-
 external/mpl/bind/dist/lib/dns/master.c                       |    6 +-
 external/mpl/bind/dist/lib/dns/masterdump.c                   |    6 +-
 external/mpl/bind/dist/lib/dns/message.c                      |   54 +-
 external/mpl/bind/dist/lib/dns/name.c                         |   21 +-
 external/mpl/bind/dist/lib/dns/openssleddsa_link.c            |   10 +-
 external/mpl/bind/dist/lib/dns/rbtdb.c                        |  187 +-
 external/mpl/bind/dist/lib/dns/rdata.c                        |  280 +---
 external/mpl/bind/dist/lib/dns/rdata/generic/ds_43.c          |    4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/key_25.c         |   56 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/opt_41.c         |   49 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/sshfp_44.c       |   31 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/unspec_103.c     |  189 --
 external/mpl/bind/dist/lib/dns/rdata/generic/unspec_103.h     |   26 -
 external/mpl/bind/dist/lib/dns/resolver.c                     |  324 ++-
 external/mpl/bind/dist/lib/dns/rpz.c                          |   47 +-
 external/mpl/bind/dist/lib/dns/stats.c                        |  131 +-
 external/mpl/bind/dist/lib/dns/tests/acl_test.c               |   21 +-
 external/mpl/bind/dist/lib/dns/tests/db_test.c                |    5 +-
 external/mpl/bind/dist/lib/dns/tests/dbdiff_test.c            |    3 +-
 external/mpl/bind/dist/lib/dns/tests/dbiterator_test.c        |    3 +-
 external/mpl/bind/dist/lib/dns/tests/dbversion_test.c         |    3 +-
 external/mpl/bind/dist/lib/dns/tests/dh_test.c                |    8 +-
 external/mpl/bind/dist/lib/dns/tests/dispatch_test.c          |    3 +-
 external/mpl/bind/dist/lib/dns/tests/dnstap_test.c            |    3 +-
 external/mpl/bind/dist/lib/dns/tests/dnstest.c                |   22 +-
 external/mpl/bind/dist/lib/dns/tests/dst_test.c               |   10 +-
 external/mpl/bind/dist/lib/dns/tests/geoip_test.c             |  380 ++--
 external/mpl/bind/dist/lib/dns/tests/keytable_test.c          |   25 +-
 external/mpl/bind/dist/lib/dns/tests/master_test.c            |   14 +-
 external/mpl/bind/dist/lib/dns/tests/name_test.c              |   11 +-
 external/mpl/bind/dist/lib/dns/tests/nsec3_test.c             |    3 +-
 external/mpl/bind/dist/lib/dns/tests/peer_test.c              |    3 +-
 external/mpl/bind/dist/lib/dns/tests/private_test.c           |    5 +-
 external/mpl/bind/dist/lib/dns/tests/rbt_serialize_test.c     |   23 +-
 external/mpl/bind/dist/lib/dns/tests/rbt_test.c               |    3 +-
 external/mpl/bind/dist/lib/dns/tests/rdata_test.c             |  718 ++++++++-
 external/mpl/bind/dist/lib/dns/tests/rdataset_test.c          |    3 +-
 external/mpl/bind/dist/lib/dns/tests/rdatasetstats_test.c     |  195 +-
 external/mpl/bind/dist/lib/dns/tests/resolver_test.c          |    6 +-
 external/mpl/bind/dist/lib/dns/tests/result_test.c            |    5 +-
 external/mpl/bind/dist/lib/dns/tests/rsa_test.c               |    3 +-
 external/mpl/bind/dist/lib/dns/tests/sigs_test.c              |   18 +-
 external/mpl/bind/dist/lib/dns/tests/time_test.c              |    7 +-
 external/mpl/bind/dist/lib/dns/tests/tkey_test.c              |   79 +-
 external/mpl/bind/dist/lib/dns/tests/tsig_test.c              |    8 +-
 external/mpl/bind/dist/lib/dns/tests/update_test.c            |    9 +-
 external/mpl/bind/dist/lib/dns/tests/zonemgr_test.c           |    3 +-
 external/mpl/bind/dist/lib/dns/tests/zt_test.c                |    3 +-
 external/mpl/bind/dist/lib/dns/update.c                       |   44 +-
 external/mpl/bind/dist/lib/dns/view.c                         |  102 +-
 external/mpl/bind/dist/lib/dns/zone.c                         |  224 +-
 external/mpl/bind/dist/lib/irs/tests/resconf_test.c           |    3 +-
 external/mpl/bind/dist/lib/isc/hash.c                         |  170 +-
 external/mpl/bind/dist/lib/isc/ht.c                           |   14 +-
 external/mpl/bind/dist/lib/isc/include/isc/endian.h           |    2 +-
 external/mpl/bind/dist/lib/isc/include/isc/hash.h             |   24 +-
 external/mpl/bind/dist/lib/isc/include/isc/siphash.h          |    2 +-
 external/mpl/bind/dist/lib/isc/include/isc/util.h             |   20 +-
 external/mpl/bind/dist/lib/isc/mem.c                          |    6 +-
 external/mpl/bind/dist/lib/isc/rwlock.c                       |    7 +-
 external/mpl/bind/dist/lib/isc/siphash.c                      |    2 +-
 external/mpl/bind/dist/lib/isc/sockaddr.c                     |   16 +-
 external/mpl/bind/dist/lib/isc/stats.c                        |  101 +-
 external/mpl/bind/dist/lib/isc/task.c                         |    4 +-
 external/mpl/bind/dist/lib/isc/tests/aes_test.c               |    3 +-
 external/mpl/bind/dist/lib/isc/tests/buffer_test.c            |    3 +-
 external/mpl/bind/dist/lib/isc/tests/counter_test.c           |    3 +-
 external/mpl/bind/dist/lib/isc/tests/crc64_test.c             |    4 +-
 external/mpl/bind/dist/lib/isc/tests/errno_test.c             |    5 +-
 external/mpl/bind/dist/lib/isc/tests/hash_test.c              |   94 +-
 external/mpl/bind/dist/lib/isc/tests/heap_test.c              |    5 +-
 external/mpl/bind/dist/lib/isc/tests/hmac_test.c              |    5 +-
 external/mpl/bind/dist/lib/isc/tests/ht_test.c                |    3 +-
 external/mpl/bind/dist/lib/isc/tests/lex_test.c               |    3 +-
 external/mpl/bind/dist/lib/isc/tests/mem_test.c               |    5 +-
 external/mpl/bind/dist/lib/isc/tests/netaddr_test.c           |    4 +-
 external/mpl/bind/dist/lib/isc/tests/parse_test.c             |    7 +-
 external/mpl/bind/dist/lib/isc/tests/pool_test.c              |    3 +-
 external/mpl/bind/dist/lib/isc/tests/queue_test.c             |    5 +-
 external/mpl/bind/dist/lib/isc/tests/radix_test.c             |    3 +-
 external/mpl/bind/dist/lib/isc/tests/random_test.c            |    3 +-
 external/mpl/bind/dist/lib/isc/tests/regex_test.c             |    8 +-
 external/mpl/bind/dist/lib/isc/tests/result_test.c            |    5 +-
 external/mpl/bind/dist/lib/isc/tests/safe_test.c              |    5 +-
 external/mpl/bind/dist/lib/isc/tests/siphash_test.c           |    2 +-
 external/mpl/bind/dist/lib/isc/tests/sockaddr_test.c          |    3 +-
 external/mpl/bind/dist/lib/isc/tests/socket_test.c            |    5 +-
 external/mpl/bind/dist/lib/isc/tests/symtab_test.c            |    3 +-
 external/mpl/bind/dist/lib/isc/tests/task_test.c              |    7 +-
 external/mpl/bind/dist/lib/isc/tests/taskpool_test.c          |    4 +-
 external/mpl/bind/dist/lib/isc/tests/time_test.c              |   15 +-
 external/mpl/bind/dist/lib/isc/tests/timer_test.c             |    3 +-
 external/mpl/bind/dist/lib/isc/unix/socket.c                  |   56 +-
 external/mpl/bind/dist/lib/isccc/tests/result_test.c          |    5 +-
 external/mpl/bind/dist/lib/isccfg/aclconf.c                   |  482 +++++-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/aclconf.h    |    6 +-
 external/mpl/bind/dist/lib/isccfg/namedconf.c                 |    6 +-
 external/mpl/bind/dist/lib/isccfg/parser.c                    |   27 +-
 external/mpl/bind/dist/lib/isccfg/tests/parser_test.c         |    3 +-
 external/mpl/bind/dist/lib/ns/client.c                        |  115 +-
 external/mpl/bind/dist/lib/ns/include/ns/client.h             |   10 +-
 external/mpl/bind/dist/lib/ns/include/ns/interfacemgr.h       |    7 +-
 external/mpl/bind/dist/lib/ns/include/ns/types.h              |    7 +-
 external/mpl/bind/dist/lib/ns/interfacemgr.c                  |   11 +-
 external/mpl/bind/dist/lib/ns/query.c                         |  310 +++-
 external/mpl/bind/dist/lib/ns/tests/listenlist_test.c         |    7 +-
 external/mpl/bind/dist/lib/ns/tests/notify_test.c             |    7 +-
 external/mpl/bind/dist/lib/ns/tests/plugin_test.c             |    2 +-
 external/mpl/bind/dist/lib/ns/tests/query_test.c              |    8 +-
 external/mpl/bind/dist/lib/ns/xfrout.c                        |  106 +-
 external/mpl/bind/include/config.h                            |   38 +-
 external/mpl/bind/include/dns/code.h                          |   16 +-
 external/mpl/bind/include/dns/enumtype.h                      |    2 -
 external/mpl/bind/include/dns/rdatastruct.h                   |   24 -
 external/mpl/bind/lib/libbind9/shlib_version                  |    4 +-
 external/mpl/bind/lib/libdns/shlib_version                    |    4 +-
 external/mpl/bind/lib/libirs/shlib_version                    |    4 +-
 external/mpl/bind/lib/libisc/Makefile                         |    4 +-
 external/mpl/bind/lib/libisc/shlib_version                    |    4 +-
 external/mpl/bind/lib/libisccc/shlib_version                  |    4 +-
 external/mpl/bind/lib/libisccfg/shlib_version                 |    4 +-
 external/mpl/bind/lib/libns/shlib_version                     |    4 +-
 173 files changed, 5181 insertions(+), 2584 deletions(-)

diffs (truncated from 14885 to 300 lines):

diff -r e0faa2772fee -r 3df7532287c0 external/mpl/bind/dist/Makefile.in
--- a/external/mpl/bind/dist/Makefile.in        Thu Sep 05 19:27:31 2019 +0000
+++ b/external/mpl/bind/dist/Makefile.in        Thu Sep 05 19:32:55 2019 +0000
@@ -97,27 +97,27 @@
        exit $$status
 
 README: README.md
-       ${PANDOC} --email-obfuscation=none -s -t html README.md | \
+       ${PANDOC} --email-obfuscation=none -s --metadata title="README" -f markdown-smart -t html README.md | \
                ${W3M} -dump -cols 75 -O ascii -T text/html | \
                sed -e '$${/^$$/d;}' > $@
 
 HISTORY: HISTORY.md
-       ${PANDOC} --email-obfuscation=none -s -t html HISTORY.md | \
+       ${PANDOC} --email-obfuscation=none -s --metadata title="HISTORY" -f markdown-smart -t html HISTORY.md | \
                ${W3M} -dump -cols 75 -O ascii -T text/html | \
                sed -e '$${/^$$/d;}' > $@
 
 OPTIONS: OPTIONS.md
-       ${PANDOC} --email-obfuscation=none -s -t html OPTIONS.md | \
+       ${PANDOC} --email-obfuscation=none -s --metadata title="OPTIONS" -f markdown-smart -t html OPTIONS.md | \
                ${W3M} -dump -cols 75 -O ascii -T text/html | \
                sed -e '$${/^$$/d;}' > $@
 
 CONTRIBUTING: CONTRIBUTING.md
-       ${PANDOC} --email-obfuscation=none -s -t html CONTRIBUTING.md | \
+       ${PANDOC} --email-obfuscation=none -s --metadata title="CONTRIBUTING" -f markdown-smart -t html CONTRIBUTING.md | \
                ${W3M} -dump -cols 75 -O ascii -T text/html | \
                sed -e '$${/^$$/d;}' > $@
 
 PLATFORMS: PLATFORMS.md
-       ${PANDOC} --email-obfuscation=none -s -t html PLATFORMS.md | \
+       ${PANDOC} --email-obfuscation=none -s --metadata title="PLATFORMS" -f markdown-smart -t html PLATFORMS.md | \
                ${W3M} -dump -cols 75 -O ascii -T text/html | \
                sed -e '$${/^$$/d;}' > $@
 
diff -r e0faa2772fee -r 3df7532287c0 external/mpl/bind/dist/bin/dig/dig.1
--- a/external/mpl/bind/dist/bin/dig/dig.1      Thu Sep 05 19:27:31 2019 +0000
+++ b/external/mpl/bind/dist/bin/dig/dig.1      Thu Sep 05 19:32:55 2019 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: dig.1,v 1.4 2019/02/24 20:01:27 christos Exp $
+.\"    $NetBSD: dig.1,v 1.5 2019/09/05 19:32:55 christos Exp $
 .\"
 .\" Copyright (C) 2000-2011, 2013-2019 Internet Systems Consortium, Inc. ("ISC")
 .\" 
@@ -363,14 +363,20 @@
 .PP
 \fB+[no]cmd\fR
 .RS 4
-Toggles the printing of the initial comment in the output identifying the version of
+Toggles the printing of the initial comment in the output, identifying the version of
 \fBdig\fR
-and the query options that have been applied\&. This comment is printed by default\&.
+and the query options that have been applied\&. This option always has global effect; it cannot be set globally and then overridden on a per\-lookup basis\&. The default is to print this comment\&.
 .RE
 .PP
 \fB+[no]comments\fR
 .RS 4
-Toggle the display of comment lines in the output\&. The default is to print comments\&.
+Toggles the display of some comment lines in the output, containing information about the packet header and OPT pseudosection, and the names of the response section\&. The default is to print these 
comments\&.
+.sp
+Other types of comments in the output are not affected by this option, but can be controlled using other command line switches\&. These include
+\fB+[no]cmd\fR,
+\fB+[no]question\fR,
+\fB+[no]stats\fR, and
+\fB+[no]rrcomments\fR\&.
 .RE
 .PP
 \fB+[no]cookie\fR\fB[=####]\fR
@@ -563,12 +569,12 @@
 .PP
 \fB+[no]qr\fR
 .RS 4
-Print [do not print] the query as it is sent\&. By default, the query is not printed\&.
+Toggles the display of the query message as it is sent\&. By default, the query is not printed\&.
 .RE
 .PP
 \fB+[no]question\fR
 .RS 4
-Print [do not print] the question section of a query when an answer is returned\&. The default is to print the question section as a comment\&.
+Toggles the display of the question section of a query when an answer is returned\&. The default is to print the question section as a comment\&.
 .RE
 .PP
 \fB+[no]raflag\fR
@@ -586,11 +592,11 @@
 .RS 4
 Toggle the setting of the RD (recursion desired) bit in the query\&. This bit is set by default, which means
 \fBdig\fR
-normally sends recursive queries\&. Recursion is automatically disabled when the
+normally sends recursive queries\&. Recursion is automatically disabled when using the
 \fI+nssearch\fR
-or
+option, and when using
 \fI+trace\fR
-query options are used\&.
+except for an initial recursive query to get the list of root servers\&.
 .RE
 .PP
 \fB+retry=T\fR
@@ -621,7 +627,7 @@
 .PP
 \fB+[no]short\fR
 .RS 4
-Provide a terse answer\&. The default is to print the answer in a verbose form\&.
+Provide a terse answer\&. The default is to print the answer in a verbose form\&. This option always has global effect; it cannot be set globally and then overridden on a per\-lookup basis\&.
 .RE
 .PP
 \fB+[no]showsearch\fR
@@ -651,7 +657,7 @@
 .PP
 \fB+[no]stats\fR
 .RS 4
-This query option toggles the printing of statistics: when the query was made, the size of the reply and so on\&. The default behavior is to print the query statistics\&.
+Toggles the printing of statistics: when the query was made, the size of the reply and so on\&. The default behavior is to print the query statistics as a comment after each lookup\&.
 .RE
 .PP
 \fB+[no]subnet=addr[/prefix\-length]\fR
diff -r e0faa2772fee -r 3df7532287c0 external/mpl/bind/dist/bin/dig/dig.c
--- a/external/mpl/bind/dist/bin/dig/dig.c      Thu Sep 05 19:27:31 2019 +0000
+++ b/external/mpl/bind/dist/bin/dig/dig.c      Thu Sep 05 19:32:55 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dig.c,v 1.3 2019/01/09 16:54:59 christos Exp $ */
+/*     $NetBSD: dig.c,v 1.4 2019/09/05 19:32:55 christos Exp $ */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -177,11 +177,13 @@
 "                 +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]cmd            (Control display of command line -\n"
+"                                      global option)\n"
+"                 +[no]comments       (Control display of packet header\n"
+"                                      and section name comments)\n"
 "                 +[no]cookie         (Add a COOKIE option to the request)\n"
-"                 +[no]crypto         (Control display of cryptographic "
-                                      "fields in records)\n"
+"                 +[no]crypto         (Control display of cryptographic\n"
+"                                      fields in records)\n"
 "                 +[no]defname        (Use search list (+[no]search))\n"
 "                 +[no]dnssec         (Request DNSSEC records)\n"
 "                 +domain=###         (Set default domainname)\n"
@@ -197,11 +199,13 @@
 "                 +[no]identify       (ID responders in short answers)\n"
 #ifdef HAVE_LIBIDN2
 "                 +[no]idnin          (Parse IDN names [default=on on tty])\n"
-"                 +[no]idnout         (Convert IDN response [default=on on tty])\n"
+"                 +[no]idnout         (Convert IDN response "
+                                       "[default=on on tty])\n"
 #endif
 "                 +[no]ignore         (Don't revert to TCP for TC responses.)\n"
 "                 +[no]keepalive      (Request EDNS TCP keepalive)\n"
-"                 +[no]keepopen       (Keep the TCP socket open between queries)\n"
+"                 +[no]keepopen       (Keep the TCP socket open between "
+                                       "queries)\n"
 "                 +[no]mapped         (Allow mapped IPv4 over IPv6)\n"
 "                 +[no]multiline      (Print records in an expanded format)\n"
 "                 +ndots=###          (Set search NDOTS value)\n"
@@ -220,7 +224,7 @@
                                        "comments)\n"
 "                 +[no]search         (Set whether to use searchlist)\n"
 "                 +[no]short          (Display nothing except short\n"
-"                                      form of answer)\n"
+"                                      form of answers - global option)\n"
 "                 +[no]showsearch     (Search with intermediate results)\n"
 "                 +[no]split=##       (Split hex/base64 fields into chunks)\n"
 "                 +[no]stats          (Control display of statistics)\n"
@@ -228,11 +232,13 @@
 "                 +[no]tcflag         (Set TC flag in query (+[no]tcflag))\n"
 "                 +[no]tcp            (TCP mode (+[no]vc))\n"
 "                 +timeout=###        (Set query timeout) [5]\n"
-"                 +[no]trace          (Trace delegation down from root [+dnssec])\n"
+"                 +[no]trace          (Trace delegation down from root "
+                                       "[+dnssec])\n"
 "                 +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]unknownformat  (Print RDATA in RFC 3597 \"unknown\" format)\n"
+"                 +[no]unknownformat  (Print RDATA in RFC 3597 \"unknown\" "
+                                       "format)\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"
@@ -504,8 +510,9 @@
        check_result(result, "dns_master_stylecreate");
 
        if (query->lookup->cmdline[0] != 0) {
-               if (!short_form)
+               if (!short_form && printcmd) {
                        fputs(query->lookup->cmdline, stdout);
+               }
                query->lookup->cmdline[0]=0;
        }
        debug("printmessage(%s %s %s)", headers ? "headers" : "noheaders",
@@ -528,7 +535,7 @@
        check_result(result, "isc_buffer_allocate");
 
        if (query->lookup->comments && !short_form) {
-               if (query->lookup->cmdline[0] != 0)
+               if (query->lookup->cmdline[0] != 0 && printcmd)
                        printf("; %s\n", query->lookup->cmdline);
                if (msg == query->lookup->sendmsg)
                        printf(";; Sending:\n");
@@ -1447,7 +1454,7 @@
                                lookup->trace = state;
                                lookup->trace_root = state;
                                if (state) {
-                                       lookup->recurse = false;
+                                       lookup->recurse = true;
                                        lookup->identify = true;
                                        lookup->comments = false;
                                        lookup->rrcomments = 0;
diff -r e0faa2772fee -r 3df7532287c0 external/mpl/bind/dist/bin/dig/dighost.c
--- a/external/mpl/bind/dist/bin/dig/dighost.c  Thu Sep 05 19:27:31 2019 +0000
+++ b/external/mpl/bind/dist/bin/dig/dighost.c  Thu Sep 05 19:32:55 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dighost.c,v 1.4 2019/02/24 20:01:27 christos Exp $     */
+/*     $NetBSD: dighost.c,v 1.5 2019/09/05 19:32:55 christos Exp $     */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1413,6 +1413,8 @@
        { 12, "PAD" },          /* shorthand */
        { 13, "CHAIN" },        /* RFC 7901 */
        { 14, "KEY-TAG" },      /* RFC 8145 */
+       { 16, "CLIENT-TAG" },   /* draft-bellis-dnsop-edns-tags */
+       { 17, "SERVER-TAG" },   /* draft-bellis-dnsop-edns-tags */
        { 26946, "DEVICEID" },  /* Brian Hartvigsen */
 };
 
@@ -2191,12 +2193,14 @@
        lookup->sendmsg->id = (dns_messageid_t)isc_random16();
        lookup->sendmsg->opcode = lookup->opcode;
        lookup->msgcounter = 0;
+
        /*
-        * If this is a trace request, completely disallow recursion, since
-        * it's meaningless for traces.
+        * If this is a trace request, completely disallow recursion after
+        * looking up the root name servers, since it's meaningless for traces.
         */
-       if (lookup->trace || (lookup->ns_search_only && !lookup->trace_root))
+       if ((lookup->trace || lookup->ns_search_only) && !lookup->trace_root) {
                lookup->recurse = false;
+       }
 
        if (lookup->recurse &&
            lookup->rdtype != dns_rdatatype_axfr &&
diff -r e0faa2772fee -r 3df7532287c0 external/mpl/bind/dist/bin/named/bind9.xsl.h
--- a/external/mpl/bind/dist/bin/named/bind9.xsl.h      Thu Sep 05 19:27:31 2019 +0000
+++ b/external/mpl/bind/dist/bin/named/bind9.xsl.h      Thu Sep 05 19:32:55 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bind9.xsl.h,v 1.3 2019/01/09 16:54:59 christos Exp $   */
+/*     $NetBSD: bind9.xsl.h,v 1.4 2019/09/05 19:32:55 christos Exp $   */
 
 /*
  * Generated by convertxsl.pl 1.14 2008/07/17 23:43:26 jinmei Exp  
@@ -22,6 +22,15 @@
        " <xsl:template match=\"statistics[@version=&quot;3.11&quot;]\">\n"
        " <html>\n"
        " <head>\n"
+       " <script type=\"text/javascript\" src=\"https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js\";></script>\n"
+       " <script type=\"text/javascript\">\n"
+       " $(function($) {\n"
+       " var wid=0;\n"
+       " $('table.zones').each(function(i) { if( $(this).width() > wid ) wid = $(this).width(); return true; });\n"
+       " $('table.zones').css('min-width', wid );\n"
+       " });\n"
+       " </script>\n"
+       "\n"
        " <xsl:if test=\"system-property('xsl:vendor')!='Transformiix'\">\n"
        " <!-- Non Mozilla specific markup -->\n"
        " <script type=\"text/javascript\" src=\"https://www.google.com/jsapi\"/>\n"
@@ -228,6 +237,22 @@
        " background-color: rgb(1,169,206);\n"
        " color: #ffffff;\n"
        " }\n"
+       " table.zones {\n"
+       " border: 1px solid grey;\n"
+       " }\n"
+       " table.zones td {\n"
+       " text-align: right;\n"
+       " font-family: monospace;\n"
+       " }\n"
+       " table.zones td:nth-child(2) {\n"
+       " text-align: center;\n"
+       " }\n"
+       " table.zones td:nth-child(3) {\n"
+       " text-align: left;\n"
+       " }\n"
+       " table.zones tr:hover{\n"
+       " background-color: #99ddff;\n"
+       " }\n"
        "\n"
        " td, th {\n"
        " padding-right: 5px;\n"
@@ -300,25 +325,25 @@
        " <hr/>\n"



Home | Main Index | Thread Index | Old Index