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 between 9.16.37 and 9.16.42
details: https://anonhg.NetBSD.org/src/rev/0f842f360299
branches: trunk
changeset: 376637:0f842f360299
user: christos <christos%NetBSD.org@localhost>
date: Mon Jun 26 22:02:59 2023 +0000
description:
merge conflicts between 9.16.37 and 9.16.42
diffstat:
external/mpl/bind/dist/bin/dig/dighost.c | 8 +-
external/mpl/bind/dist/bin/named/controlconf.c | 12 +-
external/mpl/bind/dist/bin/named/logconf.c | 8 +-
external/mpl/bind/dist/bin/named/main.c | 10 +-
external/mpl/bind/dist/bin/named/server.c | 60 ++-
external/mpl/bind/dist/bin/named/zoneconf.c | 168 ++++---
external/mpl/bind/dist/bin/nsupdate/nsupdate.c | 13 +-
external/mpl/bind/dist/bin/rndc/rndc.c | 4 +-
external/mpl/bind/dist/bin/tests/optional/ratelimiter_test.c | 4 +-
external/mpl/bind/dist/bin/tests/optional/rbt_test.c | 6 +-
external/mpl/bind/dist/bin/tests/optional/shutdown_test.c | 8 +-
external/mpl/bind/dist/bin/tests/optional/sock_test.c | 4 +-
external/mpl/bind/dist/bin/tests/optional/task_test.c | 6 +-
external/mpl/bind/dist/bin/tests/optional/timer_test.c | 8 +-
external/mpl/bind/dist/bin/tests/system/feature-test.c | 18 +-
external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/controls.conf.in | 18 -
external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.dirconf | 45 --
external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601 | 45 --
external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601-utc | 45 --
external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.pipeconf | 45 --
external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plain | 53 --
external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plainconf | 36 -
external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.symconf | 45 --
external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.tsconf | 55 --
external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.unlimited | 55 --
external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.versconf | 55 --
external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/rndc.conf.in | 26 -
external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/root.db | 27 -
external/mpl/bind/dist/bin/tests/system/ttl/tests.sh | 46 --
external/mpl/bind/dist/configure | 213 ++++++++-
external/mpl/bind/dist/doc/man/named-compilezone.1in | 206 ---------
external/mpl/bind/dist/fuzz/fuzz.h | 14 +-
external/mpl/bind/dist/lib/dns/catz.c | 20 +-
external/mpl/bind/dist/lib/dns/dnsrps.c | 3 +-
external/mpl/bind/dist/lib/dns/hmac_link.c | 3 +-
external/mpl/bind/dist/lib/dns/include/dns/view.h | 17 +-
external/mpl/bind/dist/lib/dns/include/dns/zt.h | 3 +-
external/mpl/bind/dist/lib/dns/keymgr.c | 12 +-
external/mpl/bind/dist/lib/dns/keytable.c | 13 +-
external/mpl/bind/dist/lib/dns/master.c | 4 +-
external/mpl/bind/dist/lib/dns/nsec3.c | 7 +-
external/mpl/bind/dist/lib/dns/nta.c | 9 +-
external/mpl/bind/dist/lib/dns/rbt.c | 12 +-
external/mpl/bind/dist/lib/dns/rbtdb.c | 131 +++--
external/mpl/bind/dist/lib/dns/request.c | 25 +-
external/mpl/bind/dist/lib/dns/resolver.c | 12 +-
external/mpl/bind/dist/lib/dns/rpz.c | 4 +-
external/mpl/bind/dist/lib/dns/validator.c | 50 +-
external/mpl/bind/dist/lib/dns/view.c | 102 ++++-
external/mpl/bind/dist/lib/dns/xfrin.c | 6 +-
external/mpl/bind/dist/lib/dns/zone.c | 93 ++-
external/mpl/bind/dist/lib/irs/getaddrinfo.c | 5 +-
external/mpl/bind/dist/lib/irs/resconf.c | 10 +-
external/mpl/bind/dist/lib/isc/include/isc/task.h | 27 +-
external/mpl/bind/dist/lib/isc/include/isc/timer.h | 38 +-
external/mpl/bind/dist/lib/isc/iterated_hash.c | 60 +-
external/mpl/bind/dist/lib/isc/lib.c | 3 +-
external/mpl/bind/dist/lib/isc/log.c | 21 +-
external/mpl/bind/dist/lib/isc/mem.c | 9 +-
external/mpl/bind/dist/lib/isc/netmgr/netmgr.c | 24 +-
external/mpl/bind/dist/lib/isc/ratelimiter.c | 9 +-
external/mpl/bind/dist/lib/isc/task.c | 38 +-
external/mpl/bind/dist/lib/isc/tests/task_test.c | 22 +-
external/mpl/bind/dist/lib/isc/tests/timer_test.c | 24 +-
external/mpl/bind/dist/lib/isc/timer.c | 137 +++--
external/mpl/bind/dist/lib/ns/query.c | 71 ++-
external/mpl/bind/dist/tsan-suppressions.txt | 2 -
external/mpl/bind/lib/libisc/Makefile | 3 +-
68 files changed, 1030 insertions(+), 1365 deletions(-)
diffs (truncated from 4510 to 300 lines):
diff -r ca17e01b27f9 -r 0f842f360299 external/mpl/bind/dist/bin/dig/dighost.c
--- a/external/mpl/bind/dist/bin/dig/dighost.c Mon Jun 26 21:45:59 2023 +0000
+++ b/external/mpl/bind/dist/bin/dig/dighost.c Mon Jun 26 22:02:59 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dighost.c,v 1.14 2023/01/25 21:43:23 christos Exp $ */
+/* $NetBSD: dighost.c,v 1.15 2023/06/26 22:02:59 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1586,7 +1586,7 @@ clear_query(dig_query_t *query) {
debug("clear_query(%p)", query);
if (query->timer != NULL) {
- isc_timer_detach(&query->timer);
+ isc_timer_destroy(&query->timer);
}
lookup = query->lookup;
@@ -2702,7 +2702,7 @@ bringup_timer(dig_query_t *query, unsign
debug("have local timeout of %d", local_timeout);
isc_interval_set(&l->interval, local_timeout, 0);
if (query->timer != NULL) {
- isc_timer_detach(&query->timer);
+ isc_timer_destroy(&query->timer);
}
result = isc_timer_create(timermgr, isc_timertype_once, NULL,
&l->interval, global_task, connect_timeout,
@@ -2726,7 +2726,7 @@ force_timeout(dig_query_t *query) {
* ourselves due to the duplicate events.
*/
if (query->timer != NULL) {
- isc_timer_detach(&query->timer);
+ isc_timer_destroy(&query->timer);
}
}
diff -r ca17e01b27f9 -r 0f842f360299 external/mpl/bind/dist/bin/named/controlconf.c
--- a/external/mpl/bind/dist/bin/named/controlconf.c Mon Jun 26 21:45:59 2023 +0000
+++ b/external/mpl/bind/dist/bin/named/controlconf.c Mon Jun 26 22:02:59 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: controlconf.c,v 1.10 2023/01/25 21:43:23 christos Exp $ */
+/* $NetBSD: controlconf.c,v 1.11 2023/06/26 22:02:59 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -179,7 +179,7 @@ maybe_free_connection(controlconnection_
}
if (conn->timer != NULL) {
- isc_timer_detach(&conn->timer);
+ isc_timer_destroy(&conn->timer);
}
if (conn->ccmsg_valid) {
@@ -572,10 +572,10 @@ control_timeout(isc_task_t *task, isc_ev
UNUSED(task);
- isc_timer_detach(&conn->timer);
+ isc_event_free(&event);
+
+ isc_timer_destroy(&conn->timer);
maybe_free_connection(conn);
-
- isc_event_free(&event);
}
static isc_result_t
@@ -623,7 +623,7 @@ cleanup:
}
isccc_ccmsg_invalidate(&conn->ccmsg);
if (conn->timer != NULL) {
- isc_timer_detach(&conn->timer);
+ isc_timer_destroy(&conn->timer);
}
isc_mem_put(listener->mctx, conn, sizeof(*conn));
#ifdef ENABLE_AFL
diff -r ca17e01b27f9 -r 0f842f360299 external/mpl/bind/dist/bin/named/logconf.c
--- a/external/mpl/bind/dist/bin/named/logconf.c Mon Jun 26 21:45:59 2023 +0000
+++ b/external/mpl/bind/dist/bin/named/logconf.c Mon Jun 26 22:02:59 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: logconf.c,v 1.7 2022/09/23 12:15:21 christos Exp $ */
+/* $NetBSD: logconf.c,v 1.8 2023/06/26 22:02:59 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -302,10 +302,6 @@ channel_fromconf(const cfg_obj_t *channe
dest.file.name,
isc_result_totext(result));
}
- fprintf(stderr,
- "isc_stdio_open '%s' failed: %s\n",
- dest.file.name,
- isc_result_totext(result));
} else {
(void)isc_stdio_close(fp);
}
@@ -315,8 +311,6 @@ channel_fromconf(const cfg_obj_t *channe
syslog(LOG_ERR, "isc_file_isplainfile '%s' failed: %s",
dest.file.name, isc_result_totext(result));
}
- fprintf(stderr, "isc_file_isplainfile '%s' failed: %s\n",
- dest.file.name, isc_result_totext(result));
}
done:
diff -r ca17e01b27f9 -r 0f842f360299 external/mpl/bind/dist/bin/named/main.c
--- a/external/mpl/bind/dist/bin/named/main.c Mon Jun 26 21:45:59 2023 +0000
+++ b/external/mpl/bind/dist/bin/named/main.c Mon Jun 26 22:02:59 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.14 2023/01/25 21:43:23 christos Exp $ */
+/* $NetBSD: main.c,v 1.15 2023/06/26 22:02:59 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -707,6 +707,7 @@ printversion(bool verbose) {
isc_buffer_init(&b, buf, sizeof(buf));
format_supported_algorithms(printit);
printf("\n");
+ dst_lib_destroy();
} else {
printf("DST initialization failure: %s\n",
isc_result_totext(result));
@@ -1282,6 +1283,13 @@ setup(void) {
"linked to OpenSSL version: %s",
SSLeay_version(SSLEAY_VERSION));
#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+ isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
+ NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+ "compiled with libuv version: %d.%d.%d", UV_VERSION_MAJOR,
+ UV_VERSION_MINOR, UV_VERSION_PATCH);
+ isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
+ NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+ "linked to libuv version: %s", uv_version_string());
#ifdef HAVE_LIBXML2
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
diff -r ca17e01b27f9 -r 0f842f360299 external/mpl/bind/dist/bin/named/server.c
--- a/external/mpl/bind/dist/bin/named/server.c Mon Jun 26 21:45:59 2023 +0000
+++ b/external/mpl/bind/dist/bin/named/server.c Mon Jun 26 22:02:59 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.19 2023/01/25 21:43:23 christos Exp $ */
+/* $NetBSD: server.c,v 1.20 2023/06/26 22:02:59 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -2673,6 +2673,7 @@ configure_rpz(dns_view_t *view, dns_view
if (*old_rpz_okp) {
dns_rpz_detach_rpzs(&view->rpzs);
dns_rpz_attach_rpzs(pview->rpzs, &view->rpzs);
+ dns_rpz_detach_rpzs(&pview->rpzs);
} else if (old != NULL && pview != NULL) {
++pview->rpzs->rpz_ver;
view->rpzs->rpz_ver = pview->rpzs->rpz_ver;
@@ -3175,6 +3176,7 @@ configure_catz(dns_view_t *view, dns_vie
if (old != NULL) {
dns_catz_catzs_detach(&view->catzs);
dns_catz_catzs_attach(pview->catzs, &view->catzs);
+ dns_catz_catzs_detach(&pview->catzs);
dns_catz_prereconfig(view->catzs);
}
@@ -3979,7 +3981,8 @@ configure_view(dns_view_t *view, dns_vie
const cfg_obj_t *dyndb_list, *plugin_list;
const cfg_obj_t *disabled;
const cfg_obj_t *obj, *obj2;
- const cfg_listelt_t *element;
+ const cfg_listelt_t *element = NULL;
+ const cfg_listelt_t *zone_element_latest = NULL;
in_port_t port;
dns_cache_t *cache = NULL;
isc_result_t result;
@@ -3996,7 +3999,6 @@ configure_view(dns_view_t *view, dns_vie
dns_dispatch_t *dispatch6 = NULL;
bool rpz_configured = false;
bool catz_configured = false;
- bool zones_configured = false;
bool reused_cache = false;
bool shared_cache = false;
int i = 0, j = 0, k = 0;
@@ -4100,8 +4102,8 @@ configure_view(dns_view_t *view, dns_vie
CHECK(configure_zone(config, zconfig, vconfig, mctx, view,
viewlist, kasplist, actx, false,
old_rpz_ok, false));
- }
- zones_configured = true;
+ zone_element_latest = element;
+ }
/*
* Check that a master or slave zone was found for each
@@ -5880,9 +5882,6 @@ cleanup:
named_config_get(maps, "catalog-zones", &obj) ==
ISC_R_SUCCESS)
{
- if (pview->catzs != NULL) {
- dns_catz_catzs_detach(&pview->catzs);
- }
/*
* We are swapping the places of the `view` and
* `pview` in the function's parameters list
@@ -5910,7 +5909,7 @@ cleanup:
dns_view_detach(&pview);
}
- if (zones_configured) {
+ if (zone_element_latest != NULL) {
for (element = cfg_list_first(zonelist);
element != NULL; element = cfg_list_next(element))
{
@@ -5918,6 +5917,13 @@ cleanup:
cfg_listelt_value(element);
configure_zone_setviewcommit(result, zconfig,
view);
+ if (element == zone_element_latest) {
+ /*
+ * This was the latest element that was
+ * successfully configured earlier.
+ */
+ break;
+ }
}
}
}
@@ -6772,6 +6778,7 @@ add_keydata_zone(dns_view_t *view, const
dns_zone_attach(pview->managed_keys,
&view->managed_keys);
dns_zone_setview(pview->managed_keys, view);
+ dns_zone_setviewcommit(pview->managed_keys);
dns_view_detach(&pview);
dns_zone_synckeyzone(view->managed_keys);
return (ISC_R_SUCCESS);
@@ -9291,8 +9298,8 @@ load_configuration(const char *filename,
logobj = NULL;
(void)cfg_map_get(config, "logging", &logobj);
if (logobj != NULL) {
- CHECKM(named_logconfig(logc, logobj), "configuring "
- "logging");
+ CHECKM(named_logconfig(logc, logobj),
+ "configuring logging");
} else {
named_log_setdefaultchannels(logc);
CHECKM(named_log_setunmatchedcategory(logc),
@@ -9663,6 +9670,7 @@ view_loaded(void *arg) {
if (isc_refcount_decrement(&zl->refs) == 1) {
named_server_t *server = zl->server;
bool reconfig = zl->reconfig;
+ dns_view_t *view = NULL;
isc_refcount_destroy(&zl->refs);
isc_mem_put(server->mctx, zl, sizeof(*zl));
@@ -9683,6 +9691,28 @@ view_loaded(void *arg) {
"all zones loaded");
}
+ for (view = ISC_LIST_HEAD(server->viewlist); view != NULL;
+ view = ISC_LIST_NEXT(view, link))
+ {
+ if (view->managed_keys != NULL) {
+ result = dns_zone_synckeyzone(
+ view->managed_keys);
+ if (result != ISC_R_SUCCESS) {
+ isc_log_write(
+ named_g_lctx,
+ DNS_LOGCATEGORY_DNSSEC,
+ DNS_LOGMODULE_DNSSEC,
+ ISC_LOG_ERROR,
+ "failed to initialize "
+ "managed-keys for view %s "
+ "(%s): DNSSEC validation is "
+ "at risk",
+ view->name,
+ isc_result_totext(result));
+ }
+ }
+ }
+
CHECKFATAL(dns_zonemgr_forcemaint(server->zonemgr),
"forcing zone maintenance");
@@ -9931,10 +9961,10 @@ shutdown_server(isc_task_t *task, isc_ev
isc_mem_put(server->mctx, nsc, sizeof(*nsc));
}
- isc_timer_detach(&server->interface_timer);
- isc_timer_detach(&server->heartbeat_timer);
- isc_timer_detach(&server->pps_timer);
- isc_timer_detach(&server->tat_timer);
+ isc_timer_destroy(&server->interface_timer);
+ isc_timer_destroy(&server->heartbeat_timer);
+ isc_timer_destroy(&server->pps_timer);
+ isc_timer_destroy(&server->tat_timer);
ns_interfacemgr_detach(&server->interfacemgr);
diff -r ca17e01b27f9 -r 0f842f360299 external/mpl/bind/dist/bin/named/zoneconf.c
--- a/external/mpl/bind/dist/bin/named/zoneconf.c Mon Jun 26 21:45:59 2023 +0000
+++ b/external/mpl/bind/dist/bin/named/zoneconf.c Mon Jun 26 22:02:59 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: zoneconf.c,v 1.13 2023/01/25 21:43:23 christos Exp $ */
Home |
Main Index |
Thread Index |
Old Index