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
details: https://anonhg.NetBSD.org/src/rev/7d70916d1006
branches: trunk
changeset: 449164:7d70916d1006
user: christos <christos%NetBSD.org@localhost>
date: Sun Feb 24 20:01:26 2019 +0000
description:
merge conflicts
diffstat:
external/mpl/bind/bind2netbsd | 14 +-
external/mpl/bind/dist/bin/check/named-checkconf.8 | 6 +-
external/mpl/bind/dist/bin/check/named-checkzone.8 | 6 +-
external/mpl/bind/dist/bin/confgen/ddns-confgen.8 | 6 +-
external/mpl/bind/dist/bin/confgen/rndc-confgen.8 | 6 +-
external/mpl/bind/dist/bin/delv/delv.1 | 6 +-
external/mpl/bind/dist/bin/delv/delv.c | 6 +-
external/mpl/bind/dist/bin/dig/dig.1 | 6 +-
external/mpl/bind/dist/bin/dig/dighost.c | 124 +-
external/mpl/bind/dist/bin/dig/host.1 | 6 +-
external/mpl/bind/dist/bin/dig/nslookup.1 | 6 +-
external/mpl/bind/dist/bin/dig/nslookup.c | 24 +-
external/mpl/bind/dist/bin/dnssec/dnssec-cds.8 | 8 +-
external/mpl/bind/dist/bin/dnssec/dnssec-cds.c | 10 +-
external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.8 | 153 +-
external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c | 45 +-
external/mpl/bind/dist/bin/dnssec/dnssec-importkey.8 | 6 +-
external/mpl/bind/dist/bin/dnssec/dnssec-keyfromlabel.8 | 8 +-
external/mpl/bind/dist/bin/dnssec/dnssec-keyfromlabel.c | 36 +-
external/mpl/bind/dist/bin/dnssec/dnssec-keygen.8 | 8 +-
external/mpl/bind/dist/bin/dnssec/dnssec-keygen.c | 33 +-
external/mpl/bind/dist/bin/dnssec/dnssec-revoke.8 | 6 +-
external/mpl/bind/dist/bin/dnssec/dnssec-revoke.c | 14 +-
external/mpl/bind/dist/bin/dnssec/dnssec-settime.8 | 6 +-
external/mpl/bind/dist/bin/dnssec/dnssec-signzone.8 | 6 +-
external/mpl/bind/dist/bin/dnssec/dnssec-verify.8 | 6 +-
external/mpl/bind/dist/bin/named/config.c | 8 +-
external/mpl/bind/dist/bin/named/control.c | 138 +-
external/mpl/bind/dist/bin/named/include/named/globals.h | 5 +-
external/mpl/bind/dist/bin/named/include/named/server.h | 3 +-
external/mpl/bind/dist/bin/named/main.c | 154 +-
external/mpl/bind/dist/bin/named/named.8 | 6 +-
external/mpl/bind/dist/bin/named/named.conf.5 | 115 +-
external/mpl/bind/dist/bin/named/server.c | 124 +-
external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c | 4 +-
external/mpl/bind/dist/bin/named/win32/os.c | 3 +-
external/mpl/bind/dist/bin/nsupdate/nsupdate.1 | 6 +-
external/mpl/bind/dist/bin/pkcs11/pkcs11-destroy.8 | 6 +-
external/mpl/bind/dist/bin/pkcs11/pkcs11-keygen.8 | 6 +-
external/mpl/bind/dist/bin/pkcs11/pkcs11-list.8 | 6 +-
external/mpl/bind/dist/bin/pkcs11/pkcs11-tokens.8 | 6 +-
external/mpl/bind/dist/bin/plugins/filter-aaaa.8 | 6 +-
external/mpl/bind/dist/bin/plugins/filter-aaaa.c | 15 +-
external/mpl/bind/dist/bin/python/dnssec-checkds.8 | 6 +-
external/mpl/bind/dist/bin/python/dnssec-coverage.8 | 6 +-
external/mpl/bind/dist/bin/python/dnssec-keymgr.8 | 46 +-
external/mpl/bind/dist/bin/rndc/rndc.8 | 6 +-
external/mpl/bind/dist/bin/rndc/rndc.conf.5 | 6 +-
external/mpl/bind/dist/bin/tests/optional/dst_test.c | 282 -
external/mpl/bind/dist/bin/tests/system/digdelv/ns2/example.db | 57 -
external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c | 20 +-
external/mpl/bind/dist/bin/tests/system/dnssec/ns5/trusted.conf.bad | 14 -
external/mpl/bind/dist/bin/tests/system/feature-test.c | 20 +-
external/mpl/bind/dist/bin/tests/system/inline/ns2/nsec3-loop.db | 23 -
external/mpl/bind/dist/bin/tests/system/sfcache/ns5/trusted.conf.bad | 14 -
external/mpl/bind/dist/bin/tests/system/sfcache/prereq.sh | 21 -
external/mpl/bind/dist/bin/tools/arpaname.1 | 6 +-
external/mpl/bind/dist/bin/tools/dnstap-read.1 | 6 +-
external/mpl/bind/dist/bin/tools/mdig.1 | 6 +-
external/mpl/bind/dist/bin/tools/named-journalprint.8 | 6 +-
external/mpl/bind/dist/bin/tools/named-nzd2nzf.8 | 6 +-
external/mpl/bind/dist/bin/tools/named-rrchecker.1 | 6 +-
external/mpl/bind/dist/bin/tools/nsec3hash.8 | 6 +-
external/mpl/bind/dist/bin/win32/BINDInstall/StdAfx.h | 8 +-
external/mpl/bind/dist/config.h.in | 14 +-
external/mpl/bind/dist/configure | 294 +-
external/mpl/bind/dist/contrib/dlz/drivers/dlz_stub_driver.c | 14 +-
external/mpl/bind/dist/contrib/dlz/drivers/include/dlz/sdlz_helper.h | 4 +-
external/mpl/bind/dist/contrib/dlz/drivers/sdlz_helper.c | 47 +-
external/mpl/bind/dist/contrib/dlz/modules/common/dlz_dbi.c | 3 +-
external/mpl/bind/dist/contrib/dlz/modules/filesystem/dir.c | 7 +-
external/mpl/bind/dist/contrib/sdb/bdb/README | 37 -
external/mpl/bind/dist/contrib/sdb/bdb/bdb.c | 249 -
external/mpl/bind/dist/contrib/sdb/bdb/bdb.h | 32 -
external/mpl/bind/dist/contrib/sdb/bdb/zone2bdb.c | 189 -
external/mpl/bind/dist/contrib/sdb/dir/dirdb.c | 202 -
external/mpl/bind/dist/contrib/sdb/dir/dirdb.h | 20 -
external/mpl/bind/dist/contrib/sdb/ldap/INSTALL.ldap | 83 -
external/mpl/bind/dist/contrib/sdb/ldap/README.ldap | 48 -
external/mpl/bind/dist/contrib/sdb/ldap/README.zone2ldap | 17 -
external/mpl/bind/dist/contrib/sdb/ldap/ldapdb.c | 692 ----
external/mpl/bind/dist/contrib/sdb/ldap/ldapdb.h | 8 -
external/mpl/bind/dist/contrib/sdb/ldap/zone2ldap.1 | 66 -
external/mpl/bind/dist/contrib/sdb/ldap/zone2ldap.c | 764 ----
external/mpl/bind/dist/contrib/sdb/pgsql/pgsqldb.c | 355 --
external/mpl/bind/dist/contrib/sdb/pgsql/pgsqldb.h | 20 -
external/mpl/bind/dist/contrib/sdb/pgsql/zonetodb.c | 275 -
external/mpl/bind/dist/contrib/sdb/sqlite/README.sdb_sqlite | 67 -
external/mpl/bind/dist/contrib/sdb/sqlite/sqlitedb.c | 327 -
external/mpl/bind/dist/contrib/sdb/sqlite/sqlitedb.h | 17 -
external/mpl/bind/dist/contrib/sdb/sqlite/zone2sqlite.c | 290 -
external/mpl/bind/dist/contrib/sdb/tcl/lookup.tcl | 43 -
external/mpl/bind/dist/contrib/sdb/tcl/tcldb.c | 240 -
external/mpl/bind/dist/contrib/sdb/tcl/tcldb.h | 20 -
external/mpl/bind/dist/contrib/sdb/time/timedb.c | 150 -
external/mpl/bind/dist/contrib/sdb/time/timedb.h | 20 -
external/mpl/bind/dist/doc/misc/sdb | 167 -
external/mpl/bind/dist/isc-config.sh.1 | 6 +-
external/mpl/bind/dist/lib/bind9/check.c | 68 +-
external/mpl/bind/dist/lib/dns/catz.c | 5 +-
external/mpl/bind/dist/lib/dns/dnssec.c | 124 +-
external/mpl/bind/dist/lib/dns/dnstap.c | 42 +-
external/mpl/bind/dist/lib/dns/ds.c | 7 +-
external/mpl/bind/dist/lib/dns/dst_api.c | 17 +-
external/mpl/bind/dist/lib/dns/dst_lib.c | 58 -
external/mpl/bind/dist/lib/dns/dst_parse.c | 9 +-
external/mpl/bind/dist/lib/dns/dst_parse.h | 24 +-
external/mpl/bind/dist/lib/dns/dst_result.c | 8 +-
external/mpl/bind/dist/lib/dns/dyndb.c | 4 +-
external/mpl/bind/dist/lib/dns/gssapictx.c | 3 +-
external/mpl/bind/dist/lib/dns/include/dns/dnssec.h | 36 +-
external/mpl/bind/dist/lib/dns/include/dns/ds.h | 4 +-
external/mpl/bind/dist/lib/dns/include/dns/keyvalues.h | 4 +-
external/mpl/bind/dist/lib/dns/include/dns/lib.h | 10 +-
external/mpl/bind/dist/lib/dns/include/dns/message.h | 6 +-
external/mpl/bind/dist/lib/dns/include/dns/rdata.h | 17 +-
external/mpl/bind/dist/lib/dns/include/dns/rdataset.h | 12 +-
external/mpl/bind/dist/lib/dns/include/dns/resolver.h | 4 +-
external/mpl/bind/dist/lib/dns/include/dst/dst.h | 13 +-
external/mpl/bind/dist/lib/dns/include/dst/lib.h | 36 -
external/mpl/bind/dist/lib/dns/key.c | 12 +-
external/mpl/bind/dist/lib/dns/lib.c | 27 +-
external/mpl/bind/dist/lib/dns/masterdump.c | 28 +-
external/mpl/bind/dist/lib/dns/message.c | 3 +-
external/mpl/bind/dist/lib/dns/ncache.c | 6 +-
external/mpl/bind/dist/lib/dns/nsec3.c | 14 +-
external/mpl/bind/dist/lib/dns/opensslrsa_link.c | 22 +-
external/mpl/bind/dist/lib/dns/pkcs11ecdsa_link.c | 4 +-
external/mpl/bind/dist/lib/dns/pkcs11rsa_link.c | 43 +-
external/mpl/bind/dist/lib/dns/rbtdb.c | 11 +-
external/mpl/bind/dist/lib/dns/rcode.c | 23 +-
external/mpl/bind/dist/lib/dns/rdata.c | 32 +-
external/mpl/bind/dist/lib/dns/rdata/generic/cert_37.c | 4 +-
external/mpl/bind/dist/lib/dns/rdata/generic/ds_43.c | 7 +-
external/mpl/bind/dist/lib/dns/rdata/generic/ipseckey_45.c | 4 +-
external/mpl/bind/dist/lib/dns/rdata/generic/key_25.c | 28 +-
external/mpl/bind/dist/lib/dns/rdata/generic/keydata_65533.c | 15 +-
external/mpl/bind/dist/lib/dns/rdata/generic/nsec_47.c | 6 +-
external/mpl/bind/dist/lib/dns/rdata/generic/openpgpkey_61.c | 4 +-
external/mpl/bind/dist/lib/dns/rdata/generic/rrsig_46.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/sig_24.c | 4 +-
external/mpl/bind/dist/lib/dns/rdata/generic/sshfp_44.c | 4 +-
external/mpl/bind/dist/lib/dns/rdata/generic/tlsa_52.c | 4 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/dhcid_49.c | 4 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/eid_31.c | 4 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/nimloc_32.c | 4 +-
external/mpl/bind/dist/lib/dns/resolver.c | 70 +-
external/mpl/bind/dist/lib/dns/result.c | 12 +-
external/mpl/bind/dist/lib/dns/spnego_asn1.c | 58 +-
external/mpl/bind/dist/lib/dns/tests/dbversion_test.c | 9 +-
external/mpl/bind/dist/lib/dns/tests/dnstest.c | 3 +-
external/mpl/bind/dist/lib/dns/tests/dst_test.c | 3 +-
external/mpl/bind/dist/lib/dns/tests/rdata_test.c | 312 +-
external/mpl/bind/dist/lib/dns/tests/rsa_test.c | 59 +-
external/mpl/bind/dist/lib/dns/tkey.c | 34 +-
external/mpl/bind/dist/lib/dns/tsig.c | 84 +-
external/mpl/bind/dist/lib/dns/validator.c | 10 +-
external/mpl/bind/dist/lib/dns/xfrin.c | 29 +-
external/mpl/bind/dist/lib/dns/zone.c | 1638 +++++----
external/mpl/bind/dist/lib/dns/zt.c | 12 +-
external/mpl/bind/dist/lib/irs/getaddrinfo.c | 42 +-
external/mpl/bind/dist/lib/isc/assertions.c | 15 +-
external/mpl/bind/dist/lib/isc/base32.c | 24 +-
external/mpl/bind/dist/lib/isc/base64.c | 24 +-
external/mpl/bind/dist/lib/isc/commandline.c | 16 +-
external/mpl/bind/dist/lib/isc/counter.c | 51 +-
external/mpl/bind/dist/lib/isc/error.c | 11 +-
external/mpl/bind/dist/lib/isc/hex.c | 24 +-
external/mpl/bind/dist/lib/isc/include/isc/assertions.h | 48 +-
external/mpl/bind/dist/lib/isc/include/isc/atomic.h | 11 +-
external/mpl/bind/dist/lib/isc/include/isc/base32.h | 23 +-
external/mpl/bind/dist/lib/isc/include/isc/base64.h | 26 +-
external/mpl/bind/dist/lib/isc/include/isc/hex.h | 25 +-
external/mpl/bind/dist/lib/isc/include/isc/lib.h | 11 +-
external/mpl/bind/dist/lib/isc/include/isc/log.h | 49 +-
external/mpl/bind/dist/lib/isc/include/isc/msgcat.h | 126 -
external/mpl/bind/dist/lib/isc/include/isc/msgs.h | 190 -
external/mpl/bind/dist/lib/isc/include/isc/quota.h | 35 +-
external/mpl/bind/dist/lib/isc/include/isc/result.h | 6 +-
external/mpl/bind/dist/lib/isc/include/isc/stdatomic.h | 148 -
external/mpl/bind/dist/lib/isc/include/isc/types.h | 3 +-
external/mpl/bind/dist/lib/isc/include/isc/util.h | 52 +-
external/mpl/bind/dist/lib/isc/include/pk11/result.h | 7 +-
external/mpl/bind/dist/lib/isc/lex.c | 9 +-
external/mpl/bind/dist/lib/isc/lib.c | 62 +-
external/mpl/bind/dist/lib/isc/log.c | 101 +-
external/mpl/bind/dist/lib/isc/mem.c | 66 +-
external/mpl/bind/dist/lib/isc/netaddr.c | 7 +-
external/mpl/bind/dist/lib/isc/nls/Makefile.in | 29 -
external/mpl/bind/dist/lib/isc/nls/msgcat.c | 123 -
external/mpl/bind/dist/lib/isc/pk11_result.c | 29 +-
external/mpl/bind/dist/lib/isc/pthreads/condition.c | 7 +-
external/mpl/bind/dist/lib/isc/quota.c | 73 +-
external/mpl/bind/dist/lib/isc/result.c | 51 +-
external/mpl/bind/dist/lib/isc/rwlock.c | 43 +-
external/mpl/bind/dist/lib/isc/sockaddr.c | 26 +-
external/mpl/bind/dist/lib/isc/task.c | 195 +-
external/mpl/bind/dist/lib/isc/tests/socket_test.c | 3 +-
external/mpl/bind/dist/lib/isc/timer.c | 68 +-
external/mpl/bind/dist/lib/isc/unix/app.c | 7 +-
external/mpl/bind/dist/lib/isc/unix/ifiter_getifaddrs.c | 8 +-
external/mpl/bind/dist/lib/isc/unix/interfaceiter.c | 3 +-
external/mpl/bind/dist/lib/isc/unix/net.c | 34 +-
external/mpl/bind/dist/lib/isc/unix/socket.c | 275 +-
external/mpl/bind/dist/lib/isc/win32/app.c | 3 +-
external/mpl/bind/dist/lib/isc/win32/include/isc/ntpaths.h | 5 +-
external/mpl/bind/dist/lib/isc/win32/include/isc/stdatomic.h | 136 +-
external/mpl/bind/dist/lib/isc/win32/net.c | 27 +-
external/mpl/bind/dist/lib/isc/win32/ntpaths.c | 9 +-
external/mpl/bind/dist/lib/isc/win32/socket.c | 180 +-
external/mpl/bind/dist/lib/isccc/include/isccc/lib.h | 50 -
external/mpl/bind/dist/lib/isccc/lib.c | 73 -
external/mpl/bind/dist/lib/isccc/result.c | 10 +-
external/mpl/bind/dist/lib/isccc/tests/result_test.c | 3 +-
external/mpl/bind/dist/lib/isccfg/include/isccfg/cfg.h | 13 +-
external/mpl/bind/dist/lib/isccfg/include/isccfg/grammar.h | 8 +-
external/mpl/bind/dist/lib/isccfg/namedconf.c | 63 +-
external/mpl/bind/dist/lib/isccfg/parser.c | 67 +-
external/mpl/bind/dist/lib/isccfg/tests/parser_test.c | 10 +-
external/mpl/bind/dist/lib/ns/client.c | 14 +-
external/mpl/bind/dist/lib/ns/hooks.c | 4 +-
external/mpl/bind/dist/lib/ns/include/ns/client.h | 56 +-
external/mpl/bind/dist/lib/ns/include/ns/hooks.h | 12 +-
external/mpl/bind/dist/lib/ns/include/ns/lib.h | 8 +-
external/mpl/bind/dist/lib/ns/lib.c | 3 +-
external/mpl/bind/dist/lib/ns/query.c | 82 +-
external/mpl/bind/dist/lib/ns/update.c | 14 +-
external/mpl/bind/dist/lib/ns/xfrout.c | 87 +-
external/mpl/bind/include/dns/code.h | 38 +
external/mpl/bind/include/dns/enumtype.h | 4 +
external/mpl/bind/include/dns/rdatastruct.h | 60 +
external/mpl/bind/include/isc/atomic.h | 9 +
external/mpl/bind/include/isc/stdatomic.h | 22 +-
external/mpl/bind/lib/libbind9/shlib_version | 4 +-
external/mpl/bind/lib/libdns/Makefile | 4 +-
external/mpl/bind/lib/libdns/shlib_version | 4 +-
external/mpl/bind/lib/libirs/shlib_version | 4 +-
external/mpl/bind/lib/libisc/Makefile | 5 +-
external/mpl/bind/lib/libisc/shlib_version | 4 +-
external/mpl/bind/lib/libisccc/Makefile | 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 +-
243 files changed, 3881 insertions(+), 9115 deletions(-)
diffs (truncated from 22372 to 300 lines):
diff -r a5b846e3c6bf -r 7d70916d1006 external/mpl/bind/bind2netbsd
--- a/external/mpl/bind/bind2netbsd Sun Feb 24 19:25:35 2019 +0000
+++ b/external/mpl/bind/bind2netbsd Sun Feb 24 20:01:26 2019 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: bind2netbsd,v 1.2 2019/01/09 16:54:58 christos Exp $
+# $NetBSD: bind2netbsd,v 1.3 2019/02/24 20:01:26 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -27,21 +27,21 @@
# POSSIBILITY OF SUCH DAMAGE.
#
# bind2netbsd: convert a bind tree into a
-# netbsd bind source tree, under src/external/bsd/bind/dist,
+# netbsd bind source tree, under src/external/mpl/bind/dist,
# based on bind2netbsd by Bernd Ernesti and changes by Simon Burge
#
# Rough instructions for importing new bind release:
#
# $ cd /some/where/temporary
# $ tar xpfz /new/bind/release/tar/file
-# $ sh /usr/src/external/bsd/bind/bind2netbsd bind-9.x.y `pwd`
-# $ cd src/external/bsd/bind/dist
-# $ cvs -d cvs.netbsd.org:/cvsroot import -m "Import bind 9.x.y" src/external/bsd/bind/dist ISC bind-9-x-y
+# $ sh /usr/src/external/mpl/bind/bind2netbsd bind-9.x.y `pwd`
+# $ cd src/external/mpl/bind/dist
+# $ cvs -d cvs.netbsd.org:/cvsroot import -m "Import bind 9.x.y" src/external/mpl/bind/dist ISC bind-9-x-y
# $ cd ../../../../../bind-9.x.y
# $ run ./configure --enable-dnsrps --enable-querytrace --enable-fixed-rrset
# $ run make
# - use the binclude4netbsd to create and import the new headers in
-# /usr/src/external/bsd/bind/include
+# /usr/src/external/mpl/bind/include
# - check makefiles to see if any extra sources have been added.
# - update distrib/sets if necessary.
#
@@ -52,7 +52,7 @@
if [ $# -ne 2 ]; then echo "bind2netbsd src dest"; exit 1; fi
r=$1
-d=$2/src/external/bsd/bind/dist
+d=$2/src/external/mpl/bind/dist
case "$d" in
/*)
diff -r a5b846e3c6bf -r 7d70916d1006 external/mpl/bind/dist/bin/check/named-checkconf.8
--- a/external/mpl/bind/dist/bin/check/named-checkconf.8 Sun Feb 24 19:25:35 2019 +0000
+++ b/external/mpl/bind/dist/bin/check/named-checkconf.8 Sun Feb 24 20:01:26 2019 +0000
@@ -1,6 +1,6 @@
-.\" $NetBSD: named-checkconf.8,v 1.3 2019/01/09 16:54:58 christos Exp $
+.\" $NetBSD: named-checkconf.8,v 1.4 2019/02/24 20:01:26 christos Exp $
.\"
-.\" Copyright (C) 2000-2002, 2004, 2005, 2007, 2009, 2014-2016, 2018 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2000-2002, 2004, 2005, 2007, 2009, 2014-2016, 2018, 2019 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" This Source Code Form is subject to the terms of the Mozilla Public
.\" License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -145,5 +145,5 @@
\fBInternet Systems Consortium, Inc\&.\fR
.SH "COPYRIGHT"
.br
-Copyright \(co 2000-2002, 2004, 2005, 2007, 2009, 2014-2016, 2018 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2000-2002, 2004, 2005, 2007, 2009, 2014-2016, 2018, 2019 Internet Systems Consortium, Inc. ("ISC")
.br
diff -r a5b846e3c6bf -r 7d70916d1006 external/mpl/bind/dist/bin/check/named-checkzone.8
--- a/external/mpl/bind/dist/bin/check/named-checkzone.8 Sun Feb 24 19:25:35 2019 +0000
+++ b/external/mpl/bind/dist/bin/check/named-checkzone.8 Sun Feb 24 20:01:26 2019 +0000
@@ -1,6 +1,6 @@
-.\" $NetBSD: named-checkzone.8,v 1.2 2018/08/12 13:02:26 christos Exp $
+.\" $NetBSD: named-checkzone.8,v 1.3 2019/02/24 20:01:26 christos Exp $
.\"
-.\" Copyright (C) 2000-2002, 2004-2007, 2009-2016, 2018 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2000-2002, 2004-2007, 2009-2016, 2018, 2019 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" This Source Code Form is subject to the terms of the Mozilla Public
.\" License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -327,5 +327,5 @@
\fBInternet Systems Consortium, Inc\&.\fR
.SH "COPYRIGHT"
.br
-Copyright \(co 2000-2002, 2004-2007, 2009-2016, 2018 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2000-2002, 2004-2007, 2009-2016, 2018, 2019 Internet Systems Consortium, Inc. ("ISC")
.br
diff -r a5b846e3c6bf -r 7d70916d1006 external/mpl/bind/dist/bin/confgen/ddns-confgen.8
--- a/external/mpl/bind/dist/bin/confgen/ddns-confgen.8 Sun Feb 24 19:25:35 2019 +0000
+++ b/external/mpl/bind/dist/bin/confgen/ddns-confgen.8 Sun Feb 24 20:01:26 2019 +0000
@@ -1,6 +1,6 @@
-.\" $NetBSD: ddns-confgen.8,v 1.3 2019/01/09 16:54:58 christos Exp $
+.\" $NetBSD: ddns-confgen.8,v 1.4 2019/02/24 20:01:26 christos Exp $
.\"
-.\" Copyright (C) 2009, 2014-2016, 2018 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2009, 2014-2016, 2018, 2019 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" This Source Code Form is subject to the terms of the Mozilla Public
.\" License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -146,5 +146,5 @@
\fBInternet Systems Consortium, Inc\&.\fR
.SH "COPYRIGHT"
.br
-Copyright \(co 2009, 2014-2016, 2018 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2009, 2014-2016, 2018, 2019 Internet Systems Consortium, Inc. ("ISC")
.br
diff -r a5b846e3c6bf -r 7d70916d1006 external/mpl/bind/dist/bin/confgen/rndc-confgen.8
--- a/external/mpl/bind/dist/bin/confgen/rndc-confgen.8 Sun Feb 24 19:25:35 2019 +0000
+++ b/external/mpl/bind/dist/bin/confgen/rndc-confgen.8 Sun Feb 24 20:01:26 2019 +0000
@@ -1,6 +1,6 @@
-.\" $NetBSD: rndc-confgen.8,v 1.3 2019/01/09 16:54:58 christos Exp $
+.\" $NetBSD: rndc-confgen.8,v 1.4 2019/02/24 20:01:26 christos Exp $
.\"
-.\" Copyright (C) 2001, 2003-2005, 2007, 2009, 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2001, 2003-2005, 2007, 2009, 2013-2019 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" This Source Code Form is subject to the terms of the Mozilla Public
.\" License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -208,5 +208,5 @@
\fBInternet Systems Consortium, Inc\&.\fR
.SH "COPYRIGHT"
.br
-Copyright \(co 2001, 2003-2005, 2007, 2009, 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2001, 2003-2005, 2007, 2009, 2013-2019 Internet Systems Consortium, Inc. ("ISC")
.br
diff -r a5b846e3c6bf -r 7d70916d1006 external/mpl/bind/dist/bin/delv/delv.1
--- a/external/mpl/bind/dist/bin/delv/delv.1 Sun Feb 24 19:25:35 2019 +0000
+++ b/external/mpl/bind/dist/bin/delv/delv.1 Sun Feb 24 20:01:26 2019 +0000
@@ -1,6 +1,6 @@
-.\" $NetBSD: delv.1,v 1.2 2018/08/12 13:02:27 christos Exp $
+.\" $NetBSD: delv.1,v 1.3 2019/02/24 20:01:26 christos Exp $
.\"
-.\" Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2014-2019 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" This Source Code Form is subject to the terms of the Mozilla Public
.\" License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -439,5 +439,5 @@
\fBInternet Systems Consortium, Inc\&.\fR
.SH "COPYRIGHT"
.br
-Copyright \(co 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2014-2019 Internet Systems Consortium, Inc. ("ISC")
.br
diff -r a5b846e3c6bf -r 7d70916d1006 external/mpl/bind/dist/bin/delv/delv.c
--- a/external/mpl/bind/dist/bin/delv/delv.c Sun Feb 24 19:25:35 2019 +0000
+++ b/external/mpl/bind/dist/bin/delv/delv.c Sun Feb 24 20:01:26 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: delv.c,v 1.3 2019/01/09 16:54:59 christos Exp $ */
+/* $NetBSD: delv.c,v 1.4 2019/02/24 20:01:26 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -745,8 +745,8 @@
isc_buffer_init(&b, anchortext, sizeof(anchortext) - 1);
isc_buffer_add(&b, sizeof(anchortext) - 1);
- result = cfg_parse_buffer(parser, &b, &cfg_type_bindkeys,
- &bindkeys);
+ result = cfg_parse_buffer(parser, &b, NULL, 0,
+ &cfg_type_bindkeys, 0, &bindkeys);
if (result != ISC_R_SUCCESS)
fatal("Unable to parse built-in keys");
}
diff -r a5b846e3c6bf -r 7d70916d1006 external/mpl/bind/dist/bin/dig/dig.1
--- a/external/mpl/bind/dist/bin/dig/dig.1 Sun Feb 24 19:25:35 2019 +0000
+++ b/external/mpl/bind/dist/bin/dig/dig.1 Sun Feb 24 20:01:26 2019 +0000
@@ -1,6 +1,6 @@
-.\" $NetBSD: dig.1,v 1.3 2019/01/09 16:54:59 christos Exp $
+.\" $NetBSD: dig.1,v 1.4 2019/02/24 20:01:27 christos Exp $
.\"
-.\" Copyright (C) 2000-2011, 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2000-2011, 2013-2019 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" This Source Code Form is subject to the terms of the Mozilla Public
.\" License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -826,5 +826,5 @@
\fBInternet Systems Consortium, Inc\&.\fR
.SH "COPYRIGHT"
.br
-Copyright \(co 2000-2011, 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2000-2011, 2013-2019 Internet Systems Consortium, Inc. ("ISC")
.br
diff -r a5b846e3c6bf -r 7d70916d1006 external/mpl/bind/dist/bin/dig/dighost.c
--- a/external/mpl/bind/dist/bin/dig/dighost.c Sun Feb 24 19:25:35 2019 +0000
+++ b/external/mpl/bind/dist/bin/dig/dighost.c Sun Feb 24 20:01:26 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dighost.c,v 1.3 2019/01/09 16:54:59 christos Exp $ */
+/* $NetBSD: dighost.c,v 1.4 2019/02/24 20:01:27 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -2732,27 +2732,6 @@
return;
}
- if (specified_source &&
- (isc_sockaddr_pf(&query->sockaddr) !=
- isc_sockaddr_pf(&bind_address))) {
- printf(";; Skipping server %s, incompatible "
- "address family\n", query->servname);
- query->waiting_connect = false;
- if (ISC_LINK_LINKED(query, link))
- next = ISC_LIST_NEXT(query, link);
- else
- next = NULL;
- l = query->lookup;
- clear_query(query);
- if (next == NULL) {
- printf(";; No acceptable nameservers\n");
- check_next_lookup(l);
- return;
- }
- send_tcp_connect(next);
- return;
- }
-
INSIST(query->sock == NULL);
if (keep != NULL && isc_sockaddr_equal(&keepaddr, &query->sockaddr)) {
@@ -2904,6 +2883,36 @@
}
/*%
+ * If there are more servers available for querying within 'lookup', initiate a
+ * TCP or UDP query to the next available server and return true; otherwise,
+ * return false.
+ */
+static bool
+try_next_server(dig_lookup_t *lookup) {
+ dig_query_t *current_query, *next_query;
+
+ current_query = lookup->current_query;
+ if (current_query == NULL || !ISC_LINK_LINKED(current_query, link)) {
+ return (false);
+ }
+
+ next_query = ISC_LIST_NEXT(current_query, link);
+ if (next_query == NULL) {
+ return (false);
+ }
+
+ debug("trying next server...");
+
+ if (lookup->tcp_mode) {
+ send_tcp_connect(next_query);
+ } else {
+ send_udp(next_query);
+ }
+
+ return (true);
+}
+
+/*%
* IO timeout handler, used for both connect and recv timeouts. If
* retries are still allowed, either resend the UDP packet or queue a
* new TCP lookup. Otherwise, cancel the lookup.
@@ -2911,7 +2920,7 @@
static void
connect_timeout(isc_task_t *task, isc_event_t *event) {
dig_lookup_t *l = NULL;
- dig_query_t *query = NULL, *cq;
+ dig_query_t *query = NULL;
UNUSED(task);
REQUIRE(event->ev_type == ISC_TIMEREVENT_IDLE);
@@ -2931,18 +2940,14 @@
return;
}
- if ((query != NULL) && (query->lookup->current_query != NULL) &&
- ISC_LINK_LINKED(query->lookup->current_query, link) &&
- (ISC_LIST_NEXT(query->lookup->current_query, link) != NULL)) {
- debug("trying next server...");
- cq = query->lookup->current_query;
- if (!l->tcp_mode)
- send_udp(ISC_LIST_NEXT(cq, link));
- else {
- if (query->sock != NULL)
+ if (try_next_server(l)) {
+ if (l->tcp_mode) {
+ if (query->sock != NULL) {
isc_socket_cancel(query->sock, NULL,
ISC_SOCKCANCEL_ALL);
- send_tcp_connect(ISC_LIST_NEXT(cq, link));
+ } else {
+ clear_query(query);
+ }
}
UNLOCK_LOOKUP;
return;
@@ -2989,6 +2994,27 @@
}
/*%
+ * Called when a peer closes a TCP socket prematurely.
+ */
+static void
+requeue_or_update_exitcode(dig_lookup_t *lookup) {
+ if (lookup->eoferr == 0U) {
+ /*
+ * Peer closed the connection prematurely for the first time
Home |
Main Index |
Thread Index |
Old Index