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 bind 9.14.8
details: https://anonhg.NetBSD.org/src/rev/6253632c2e6c
branches: trunk
changeset: 461451:6253632c2e6c
user: christos <christos%NetBSD.org@localhost>
date: Wed Nov 27 05:48:39 2019 +0000
description:
merge bind 9.14.8
diffstat:
external/mpl/bind/bind2netbsd | 4 +-
external/mpl/bind/dist/bin/check/check-tool.c | 4 +-
external/mpl/bind/dist/bin/delv/delv.c | 4 +-
external/mpl/bind/dist/bin/dig/dighost.c | 36 +-
external/mpl/bind/dist/bin/dig/host.c | 6 +-
external/mpl/bind/dist/bin/dig/nslookup.c | 6 +-
external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c | 26 +-
external/mpl/bind/dist/bin/dnssec/dnssec-importkey.c | 6 +-
external/mpl/bind/dist/bin/dnssec/dnssec-signzone.c | 13 +-
external/mpl/bind/dist/bin/named/config.c | 6 +-
external/mpl/bind/dist/bin/named/include/named/globals.h | 10 +-
external/mpl/bind/dist/bin/named/main.c | 24 +-
external/mpl/bind/dist/bin/named/server.c | 60 +-
external/mpl/bind/dist/bin/named/statschannel.c | 5 +-
external/mpl/bind/dist/bin/named/win32/os.c | 3 +-
external/mpl/bind/dist/bin/named/zoneconf.c | 19 +-
external/mpl/bind/dist/bin/nsupdate/nsupdate.c | 4 +-
external/mpl/bind/dist/bin/tests/optional/zone_test.c | 7 +-
external/mpl/bind/dist/bin/tests/system/checkzone/zones/.gitattributes | 1 -
external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c | 3 +-
external/mpl/bind/dist/bin/tests/system/dyndb/driver/syncptr.c | 12 +-
external/mpl/bind/dist/configure | 5 +-
external/mpl/bind/dist/doc/arm/Bv9ARM.pdf | 3910 ++++++++-
external/mpl/bind/dist/doc/arm/notes-bug-fixes.xml | 81 -
external/mpl/bind/dist/doc/arm/notes-new-features.xml | 78 -
external/mpl/bind/dist/doc/arm/notes-sec-fixes.xml | 37 -
external/mpl/bind/dist/lib/bind9/check.c | 59 +-
external/mpl/bind/dist/lib/dns/acl.c | 4 +-
external/mpl/bind/dist/lib/dns/adb.c | 10 +-
external/mpl/bind/dist/lib/dns/client.c | 43 +-
external/mpl/bind/dist/lib/dns/dnsrps.c | 7 +-
external/mpl/bind/dist/lib/dns/ecdb.c | 19 +-
external/mpl/bind/dist/lib/dns/geoip2.c | 33 +-
external/mpl/bind/dist/lib/dns/gssapi_link.c | 4 +-
external/mpl/bind/dist/lib/dns/include/dns/acl.h | 4 +-
external/mpl/bind/dist/lib/dns/include/dns/name.h | 11 +-
external/mpl/bind/dist/lib/dns/include/dns/tsig.h | 20 +-
external/mpl/bind/dist/lib/dns/journal.c | 4 +-
external/mpl/bind/dist/lib/dns/lookup.c | 22 +-
external/mpl/bind/dist/lib/dns/masterdump.c | 44 +-
external/mpl/bind/dist/lib/dns/message.c | 4 +-
external/mpl/bind/dist/lib/dns/name.c | 55 +-
external/mpl/bind/dist/lib/dns/nsec3.c | 8 +-
external/mpl/bind/dist/lib/dns/nta.c | 4 +-
external/mpl/bind/dist/lib/dns/openssldh_link.c | 4 +-
external/mpl/bind/dist/lib/dns/opensslrsa_link.c | 4 +-
external/mpl/bind/dist/lib/dns/order.c | 5 +-
external/mpl/bind/dist/lib/dns/rbt.c | 20 +-
external/mpl/bind/dist/lib/dns/rbtdb.c | 59 +-
external/mpl/bind/dist/lib/dns/rcode.c | 4 +-
external/mpl/bind/dist/lib/dns/rdata.c | 4 +-
external/mpl/bind/dist/lib/dns/rdata/any_255/tsig_250.c | 6 +-
external/mpl/bind/dist/lib/dns/rdata/ch_3/a_1.c | 6 +-
external/mpl/bind/dist/lib/dns/rdata/generic/afsdb_18.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/avc_258.c | 10 +-
external/mpl/bind/dist/lib/dns/rdata/generic/caa_257.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/cds_59.c | 20 +-
external/mpl/bind/dist/lib/dns/rdata/generic/cert_37.c | 6 +-
external/mpl/bind/dist/lib/dns/rdata/generic/cname_5.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/csync_62.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/dlv_32769.c | 3 +-
external/mpl/bind/dist/lib/dns/rdata/generic/dname_39.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/doa_259.c | 7 +-
external/mpl/bind/dist/lib/dns/rdata/generic/ds_43.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/eui48_108.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/eui64_109.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/gpos_27.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/hinfo_13.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/hip_55.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/ipseckey_45.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/isdn_20.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/key_25.c | 4 +-
external/mpl/bind/dist/lib/dns/rdata/generic/keydata_65533.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/l32_105.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/l64_106.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/loc_29.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/lp_107.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/mb_7.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/md_3.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/mf_4.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/mg_8.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/minfo_14.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/mr_9.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/mx_15.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/naptr_35.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/nid_104.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/ninfo_56.c | 13 +-
external/mpl/bind/dist/lib/dns/rdata/generic/ns_2.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/nsec3_50.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/nsec3param_51.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/nsec_47.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/null_10.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/nxt_30.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/openpgpkey_61.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/opt_41.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/proforma.c | 6 +-
external/mpl/bind/dist/lib/dns/rdata/generic/ptr_12.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/rp_17.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/rrsig_46.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/rt_21.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/sig_24.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/sink_40.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/smimea_53.c | 7 +-
external/mpl/bind/dist/lib/dns/rdata/generic/soa_6.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/spf_99.c | 11 +-
external/mpl/bind/dist/lib/dns/rdata/generic/sshfp_44.c | 6 +-
external/mpl/bind/dist/lib/dns/rdata/generic/ta_32768.c | 3 +-
external/mpl/bind/dist/lib/dns/rdata/generic/talink_58.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/tkey_249.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/tlsa_52.c | 10 +-
external/mpl/bind/dist/lib/dns/rdata/generic/txt_16.c | 12 +-
external/mpl/bind/dist/lib/dns/rdata/generic/uri_256.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/generic/x25_19.c | 9 +-
external/mpl/bind/dist/lib/dns/rdata/hs_4/a_1.c | 5 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/a6_38.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/a_1.c | 7 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/aaaa_28.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/apl_42.c | 7 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/atma_34.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/dhcid_49.c | 6 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/eid_31.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/kx_36.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/nimloc_32.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/nsap-ptr_23.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/nsap_22.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/px_26.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/srv_33.c | 8 +-
external/mpl/bind/dist/lib/dns/rdata/in_1/wks_11.c | 7 +-
external/mpl/bind/dist/lib/dns/rdatalist.c | 16 +-
external/mpl/bind/dist/lib/dns/rdataset.c | 4 +-
external/mpl/bind/dist/lib/dns/resolver.c | 73 +-
external/mpl/bind/dist/lib/dns/rrl.c | 7 +-
external/mpl/bind/dist/lib/dns/sdb.c | 27 +-
external/mpl/bind/dist/lib/dns/sdlz.c | 24 +-
external/mpl/bind/dist/lib/dns/spnego_asn1.c | 3 +-
external/mpl/bind/dist/lib/dns/tests/dnstap_test.c | 4 +-
external/mpl/bind/dist/lib/dns/tests/dnstest.c | 5 +-
external/mpl/bind/dist/lib/dns/tests/master_test.c | 5 +-
external/mpl/bind/dist/lib/dns/tests/rbt_serialize_test.c | 5 +-
external/mpl/bind/dist/lib/dns/tkey.c | 9 +-
external/mpl/bind/dist/lib/dns/tsig.c | 17 +-
external/mpl/bind/dist/lib/dns/ttl.c | 3 +-
external/mpl/bind/dist/lib/dns/update.c | 24 +-
external/mpl/bind/dist/lib/dns/validator.c | 23 +-
external/mpl/bind/dist/lib/dns/view.c | 21 +-
external/mpl/bind/dist/lib/dns/zone.c | 121 +-
external/mpl/bind/dist/lib/dns/zoneverify.c | 52 +-
external/mpl/bind/dist/lib/isc/buffer.c | 5 +-
external/mpl/bind/dist/lib/isc/include/isc/result.h | 6 +-
external/mpl/bind/dist/lib/isc/include/isc/stats.h | 27 +-
external/mpl/bind/dist/lib/isc/include/isc/types.h | 8 +-
external/mpl/bind/dist/lib/isc/include/isc/util.h | 18 +-
external/mpl/bind/dist/lib/isc/pk11.c | 8 +-
external/mpl/bind/dist/lib/isc/result.c | 6 +-
external/mpl/bind/dist/lib/isc/sockaddr.c | 3 +-
external/mpl/bind/dist/lib/isc/stats.c | 53 +-
external/mpl/bind/dist/lib/isc/task.c | 11 +-
external/mpl/bind/dist/lib/isc/tests/hmac_test.c | 6 +-
external/mpl/bind/dist/lib/isc/tests/ht_test.c | 3 +-
external/mpl/bind/dist/lib/isc/tests/md_test.c | 6 +-
external/mpl/bind/dist/lib/isc/tests/mem_test.c | 3 +-
external/mpl/bind/dist/lib/isc/tests/random_test.c | 3 +-
external/mpl/bind/dist/lib/isc/unix/meminfo.c | 4 +-
external/mpl/bind/dist/lib/isc/unix/net.c | 4 +-
external/mpl/bind/dist/lib/isc/unix/resource.c | 3 +-
external/mpl/bind/dist/lib/isc/unix/socket.c | 5 +-
external/mpl/bind/dist/lib/isc/win32/app.c | 19 +-
external/mpl/bind/dist/lib/isc/win32/socket.c | 3 +-
external/mpl/bind/dist/lib/isccfg/aclconf.c | 3 +-
external/mpl/bind/dist/lib/isccfg/parser.c | 53 +-
external/mpl/bind/dist/lib/ns/client.c | 92 +-
external/mpl/bind/dist/lib/ns/include/ns/client.h | 7 +-
external/mpl/bind/dist/lib/ns/include/ns/stats.h | 13 +-
external/mpl/bind/dist/lib/ns/interfacemgr.c | 6 +-
external/mpl/bind/dist/lib/ns/query.c | 89 +-
external/mpl/bind/dist/lib/ns/stats.c | 19 +-
external/mpl/bind/dist/lib/ns/update.c | 14 +-
external/mpl/bind/dist/lib/samples/nsprobe.c | 4 +-
external/mpl/bind/include/config.h | 3 -
179 files changed, 4543 insertions(+), 1843 deletions(-)
diffs (truncated from 16528 to 300 lines):
diff -r 388b07928b03 -r 6253632c2e6c external/mpl/bind/bind2netbsd
--- a/external/mpl/bind/bind2netbsd Wed Nov 27 03:47:05 2019 +0000
+++ b/external/mpl/bind/bind2netbsd Wed Nov 27 05:48:39 2019 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: bind2netbsd,v 1.4 2019/10/17 16:46:57 christos Exp $
+# $NetBSD: bind2netbsd,v 1.5 2019/11/27 05:48:39 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,7 +39,7 @@
# $ cvs -d cvs.netbsd.org:/cvsroot import src/external/mpl/bind/dist ISC bind-9-x-y
# Enter the new CHANGES portion as your commit message
# $ cd ../../../../../bind-9.x.y
-# $ run ./configure --enable-dnsrps --enable-querytrace --enable-fixed-rrset
+# $ run ./configure --enable-dnsrps --enable-querytrace --enable-fixed-rrset --without-python
# $ run make
# - use the binclude4netbsd to create and import the new headers in
# /usr/src/external/mpl/bind/include
diff -r 388b07928b03 -r 6253632c2e6c external/mpl/bind/dist/bin/check/check-tool.c
--- a/external/mpl/bind/dist/bin/check/check-tool.c Wed Nov 27 03:47:05 2019 +0000
+++ b/external/mpl/bind/dist/bin/check/check-tool.c Wed Nov 27 05:48:39 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: check-tool.c,v 1.3 2019/01/09 16:54:58 christos Exp $ */
+/* $NetBSD: check-tool.c,v 1.4 2019/11/27 05:48:39 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -724,7 +724,7 @@
FILE *output = stdout;
const char *flags;
- flags = (fileformat == dns_masterformat_text) ? "w+" : "wb+";
+ flags = (fileformat == dns_masterformat_text) ? "w" : "wb";
if (debug) {
if (filename != NULL && strcmp(filename, "-") != 0)
diff -r 388b07928b03 -r 6253632c2e6c external/mpl/bind/dist/bin/delv/delv.c
--- a/external/mpl/bind/dist/bin/delv/delv.c Wed Nov 27 03:47:05 2019 +0000
+++ b/external/mpl/bind/dist/bin/delv/delv.c Wed Nov 27 05:48:39 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: delv.c,v 1.4 2019/02/24 20:01:26 christos Exp $ */
+/* $NetBSD: delv.c,v 1.5 2019/11/27 05:48:39 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -504,7 +504,7 @@
isc_result_t result;
dns_master_style_t *style = NULL;
- REQUIRE(stylep != NULL || *stylep == NULL);
+ REQUIRE(stylep != NULL && *stylep == NULL);
styleflags |= DNS_STYLEFLAG_REL_OWNER;
if (showcomments)
diff -r 388b07928b03 -r 6253632c2e6c external/mpl/bind/dist/bin/dig/dighost.c
--- a/external/mpl/bind/dist/bin/dig/dighost.c Wed Nov 27 03:47:05 2019 +0000
+++ b/external/mpl/bind/dist/bin/dig/dighost.c Wed Nov 27 05:48:39 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dighost.c,v 1.6 2019/10/17 16:46:58 christos Exp $ */
+/* $NetBSD: dighost.c,v 1.7 2019/11/27 05:48:39 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -812,8 +812,8 @@
memmove(looknew->ecs_addr, lookold->ecs_addr, len);
}
- dns_name_copy(dns_fixedname_name(&lookold->fdomain),
- dns_fixedname_name(&looknew->fdomain), NULL);
+ dns_name_copynf(dns_fixedname_name(&lookold->fdomain),
+ dns_fixedname_name(&looknew->fdomain));
if (servers)
clone_server_list(lookold->my_server_list,
@@ -1826,7 +1826,7 @@
if (lookup->ns_search_only)
lookup->recurse = false;
domain = dns_fixedname_name(&lookup->fdomain);
- dns_name_copy(name, domain, NULL);
+ dns_name_copynf(name, domain);
}
debug("adding server %s", namestr);
num = getaddresses(lookup, namestr, &lresult);
@@ -2030,6 +2030,9 @@
char cookiebuf[256];
char *origin = NULL;
char *textname = NULL;
+
+ REQUIRE(lookup != NULL);
+
#ifdef HAVE_LIBIDN2
char idn_origin[MXNAME], idn_textname[MXNAME];
@@ -2038,7 +2041,6 @@
check_result(result, "dns_name_settotextfilter");
#endif /* HAVE_LIBIDN2 */
- REQUIRE(lookup != NULL);
INSIST(!free_now);
debug("setup_lookup(%p)", lookup);
@@ -2139,22 +2141,26 @@
isc_buffer_init(&b, textname, len);
isc_buffer_add(&b, len);
result = dns_name_fromtext(name, &b, NULL, 0, NULL);
- if (result == ISC_R_SUCCESS &&
- !dns_name_isabsolute(name))
- result = dns_name_concatenate(name,
- lookup->oname,
- lookup->name,
- &lookup->namebuf);
- else if (result == ISC_R_SUCCESS)
- result = dns_name_copy(name, lookup->name,
- &lookup->namebuf);
+ if (result == ISC_R_SUCCESS) {
+ if (!dns_name_isabsolute(name)) {
+ result = dns_name_concatenate(name,
+ lookup->oname,
+ lookup->name,
+ &lookup->namebuf);
+ } else {
+ result = dns_name_copy(name,
+ lookup->name,
+ &lookup->namebuf);
+ }
+ }
if (result != ISC_R_SUCCESS) {
dns_message_puttempname(lookup->sendmsg,
&lookup->name);
dns_message_puttempname(lookup->sendmsg,
&lookup->oname);
- if (result == DNS_R_NAMETOOLONG)
+ if (result == DNS_R_NAMETOOLONG) {
return (false);
+ }
fatal("'%s' is not in legal name syntax (%s)",
lookup->textname,
isc_result_totext(result));
diff -r 388b07928b03 -r 6253632c2e6c external/mpl/bind/dist/bin/dig/host.c
--- a/external/mpl/bind/dist/bin/dig/host.c Wed Nov 27 03:47:05 2019 +0000
+++ b/external/mpl/bind/dist/bin/dig/host.c Wed Nov 27 05:48:39 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: host.c,v 1.3 2019/01/09 16:54:59 christos Exp $ */
+/* $NetBSD: host.c,v 1.4 2019/11/27 05:48:39 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -398,7 +398,7 @@
dns_rdataset_current(rdataset, &rdata);
result = dns_rdata_tostruct(&rdata, &cname, NULL);
check_result(result, "dns_rdata_tostruct");
- dns_name_copy(&cname.cname, qname, NULL);
+ dns_name_copynf(&cname.cname, qname);
dns_rdata_freestruct(&cname);
}
}
@@ -457,7 +457,7 @@
/* Add AAAA and MX lookups. */
name = dns_fixedname_initname(&fixed);
- dns_name_copy(query->lookup->name, name, NULL);
+ dns_name_copynf(query->lookup->name, name);
chase_cnamechain(msg, name);
dns_name_format(name, namestr, sizeof(namestr));
lookup = clone_lookup(query->lookup, false);
diff -r 388b07928b03 -r 6253632c2e6c external/mpl/bind/dist/bin/dig/nslookup.c
--- a/external/mpl/bind/dist/bin/dig/nslookup.c Wed Nov 27 03:47:05 2019 +0000
+++ b/external/mpl/bind/dist/bin/dig/nslookup.c Wed Nov 27 05:48:39 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nslookup.c,v 1.4 2019/02/24 20:01:27 christos Exp $ */
+/* $NetBSD: nslookup.c,v 1.5 2019/11/27 05:48:39 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -427,7 +427,7 @@
dns_rdataset_current(rdataset, &rdata);
result = dns_rdata_tostruct(&rdata, &cname, NULL);
check_result(result, "dns_rdata_tostruct");
- dns_name_copy(&cname.cname, qname, NULL);
+ dns_name_copynf(&cname.cname, qname);
dns_rdata_freestruct(&cname);
}
}
@@ -480,7 +480,7 @@
/* Add AAAA lookup. */
name = dns_fixedname_initname(&fixed);
- dns_name_copy(query->lookup->name, name, NULL);
+ dns_name_copynf(query->lookup->name, name);
chase_cnamechain(msg, name);
dns_name_format(name, namestr, sizeof(namestr));
lookup = clone_lookup(query->lookup, false);
diff -r 388b07928b03 -r 6253632c2e6c external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c
--- a/external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c Wed Nov 27 03:47:05 2019 +0000
+++ b/external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c Wed Nov 27 05:48:39 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dnssec-dsfromkey.c,v 1.6 2019/10/17 16:46:58 christos Exp $ */
+/* $NetBSD: dnssec-dsfromkey.c,v 1.7 2019/11/27 05:48:39 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -209,9 +209,7 @@
rdclass = dst_key_class(key);
name = dns_fixedname_initname(&fixed);
- result = dns_name_copy(dst_key_name(key), name, NULL);
- if (result != ISC_R_SUCCESS)
- fatal("can't copy name");
+ dns_name_copynf(dst_key_name(key), name);
dst_key_free(&key);
}
@@ -350,7 +348,7 @@
char *classname = NULL;
char *filename = NULL, *dir = NULL, *namestr;
char *lookaside = NULL;
- char *endp;
+ char *endp, *arg1;
int ch;
dns_dsdigest_t dtype = DNS_DSDIGEST_SHA1;
bool cds = false;
@@ -478,10 +476,15 @@
showall = true;
}
- if (argc < isc_commandline_index + 1 && filename == NULL) {
+ /*
+ * Use local variable arg1 so that clang can correctly analyse
+ * reachable paths rather than 'argc < isc_commandline_index + 1'.
+ */
+ arg1 = argv[isc_commandline_index];
+ if (arg1 == NULL && filename == NULL) {
fatal("the key file name was not specified");
}
- if (argc > isc_commandline_index + 1) {
+ if (arg1 != NULL && argv[isc_commandline_index + 1] != NULL) {
fatal("extraneous arguments");
}
@@ -496,11 +499,11 @@
dns_rdataset_init(&rdataset);
if (usekeyset || filename != NULL) {
- if (argc < isc_commandline_index + 1) {
- /* using zone name as the zone file name */
+ if (arg1 == NULL) {
+ /* using file name as the zone name */
namestr = filename;
} else {
- namestr = argv[isc_commandline_index];
+ namestr = arg1;
}
result = initname(namestr);
@@ -542,8 +545,7 @@
} else {
unsigned char key_buf[DST_KEY_MAXSIZE];
- loadkey(argv[isc_commandline_index], key_buf,
- DST_KEY_MAXSIZE, &rdata);
+ loadkey(arg1, key_buf, DST_KEY_MAXSIZE, &rdata);
if (both) {
emit(DNS_DSDIGEST_SHA1, showall, lookaside, cds,
diff -r 388b07928b03 -r 6253632c2e6c external/mpl/bind/dist/bin/dnssec/dnssec-importkey.c
--- a/external/mpl/bind/dist/bin/dnssec/dnssec-importkey.c Wed Nov 27 03:47:05 2019 +0000
+++ b/external/mpl/bind/dist/bin/dnssec/dnssec-importkey.c Wed Nov 27 05:48:39 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dnssec-importkey.c,v 1.3 2019/01/09 16:54:59 christos Exp $ */
+/* $NetBSD: dnssec-importkey.c,v 1.4 2019/11/27 05:48:39 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -183,9 +183,7 @@
rdclass = dst_key_class(key);
name = dns_fixedname_initname(&fixed);
- result = dns_name_copy(dst_key_name(key), name, NULL);
- if (result != ISC_R_SUCCESS)
- fatal("can't copy name");
+ dns_name_copynf(dst_key_name(key), name);
dst_key_free(&key);
}
diff -r 388b07928b03 -r 6253632c2e6c external/mpl/bind/dist/bin/dnssec/dnssec-signzone.c
--- a/external/mpl/bind/dist/bin/dnssec/dnssec-signzone.c Wed Nov 27 03:47:05 2019 +0000
+++ b/external/mpl/bind/dist/bin/dnssec/dnssec-signzone.c Wed Nov 27 05:48:39 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dnssec-signzone.c,v 1.3 2019/01/09 16:54:59 christos Exp $ */
+/* $NetBSD: dnssec-signzone.c,v 1.4 2019/11/27 05:48:39 christos Exp $ */
/*
* Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -206,7 +206,7 @@
dns_name_t *result;
result = dns_fixedname_initname(fzonecut);
- dns_name_copy(name, result, NULL);
Home |
Main Index |
Thread Index |
Old Index