Module Name: src
Committed By: christos
Date: Thu Aug 19 11:50:57 UTC 2021
Modified Files:
src/external/mpl/dhcp: Makefile.inc
src/external/mpl/dhcp/dist/includes/omapip: isclib.h
src/external/mpl/dhcp/dist/omapip: isclib.c
Log Message:
Adjust for bind-9.16.20
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mpl/dhcp/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/includes/omapip/isclib.h
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/dhcp/dist/omapip/isclib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/Makefile.inc
diff -u src/external/mpl/dhcp/Makefile.inc:1.10 src/external/mpl/dhcp/Makefile.inc:1.11
--- src/external/mpl/dhcp/Makefile.inc:1.10 Tue Apr 13 00:14:46 2021
+++ src/external/mpl/dhcp/Makefile.inc Thu Aug 19 07:50:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2021/04/13 04:14:46 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.11 2021/08/19 11:50:56 christos Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -45,8 +45,8 @@ LDADD+= -lirs -lisccfg -ldns -lisc
LDADD+= -L${LIBUVOBJDIR} -luv
DPADD+= ${LIBIRS} ${LIBISCCFG} ${LIBDNS} ${LIBISC} ${LIBUV}
DPADD+= ${LIBUVOBJDIR}/libuv.a
-LDADD+= -lkvm -lpthread -lz
-DPADD+= ${LIBKVM} ${LIBPTHREAD} ${LIBZ}
+LDADD+= -lexecinfo -lkvm -lpthread -lz
+DPADD+= ${LIBEXECINFO} ${LIBKVM} ${LIBPTHREAD} ${LIBZ}
.if (${MKKERBEROS} != "no")
LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD} ${LIBKRB5_STATIC_LDADD}
DPADD+= ${LIBKRB5_DPADD} ${LIBHEIMNTLM} ${LIBGSSAPI} ${LIBKRB5_STATIC_DPADD}
Index: src/external/mpl/dhcp/dist/includes/omapip/isclib.h
diff -u src/external/mpl/dhcp/dist/includes/omapip/isclib.h:1.3 src/external/mpl/dhcp/dist/includes/omapip/isclib.h:1.4
--- src/external/mpl/dhcp/dist/includes/omapip/isclib.h:1.3 Mon Aug 3 17:10:57 2020
+++ src/external/mpl/dhcp/dist/includes/omapip/isclib.h Thu Aug 19 07:50:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isclib.h,v 1.3 2020/08/03 21:10:57 christos Exp $ */
+/* $NetBSD: isclib.h,v 1.4 2021/08/19 11:50:56 christos Exp $ */
/* isclib.h
@@ -54,6 +54,7 @@
#include <isc/lex.h>
#include <isc/lib.h>
#include <isc/app.h>
+#include <isc/managers.h>
#include <isc/mem.h>
#include <isc/parseint.h>
#include <isc/socket.h>
@@ -96,6 +97,7 @@ typedef struct dhcp_context {
int actx_started; // ISC_TRUE if ctxstart has been called
int actx_running; // ISC_TRUE if ctxrun has been called
isc_taskmgr_t *taskmgr;
+ isc_nm_t *netmgr;
isc_task_t *task;
isc_socketmgr_t *socketmgr;
isc_timermgr_t *timermgr;
Index: src/external/mpl/dhcp/dist/omapip/isclib.c
diff -u src/external/mpl/dhcp/dist/omapip/isclib.c:1.5 src/external/mpl/dhcp/dist/omapip/isclib.c:1.6
--- src/external/mpl/dhcp/dist/omapip/isclib.c:1.5 Mon Aug 3 17:10:57 2020
+++ src/external/mpl/dhcp/dist/omapip/isclib.c Thu Aug 19 07:50:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isclib.c,v 1.5 2020/08/03 21:10:57 christos Exp $ */
+/* $NetBSD: isclib.c,v 1.6 2021/08/19 11:50:56 christos Exp $ */
/*
* Copyright(c) 2009-2019 by Internet Systems Consortium, Inc.("ISC")
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: isclib.c,v 1.5 2020/08/03 21:10:57 christos Exp $");
+__RCSID("$NetBSD: isclib.c,v 1.6 2021/08/19 11:50:56 christos Exp $");
/*Trying to figure out what we need to define to get things to work.
It looks like we want/need the library but need the fdwatchcommand
@@ -109,7 +109,8 @@ isclib_cleanup(void)
isc_socketmgr_destroy(&dhcp_gbl_ctx.socketmgr);
if (dhcp_gbl_ctx.taskmgr != NULL)
- isc_taskmgr_destroy(&dhcp_gbl_ctx.taskmgr);
+ isc_managers_destroy(&dhcp_gbl_ctx.netmgr,
+ &dhcp_gbl_ctx.taskmgr);
if (dhcp_gbl_ctx.actx_started != ISC_FALSE) {
isc_app_ctxfinish(dhcp_gbl_ctx.actx);
@@ -218,22 +219,19 @@ dhcp_context_create(int flags,
result = isc_appctx_create(dhcp_gbl_ctx.mctx,
&dhcp_gbl_ctx.actx);
- if (result != ISC_R_SUCCESS)
- goto cleanup;
- result = isc_taskmgr_createinctx(dhcp_gbl_ctx.mctx,
- 1, 0,
- &dhcp_gbl_ctx.taskmgr);
+ result = isc_managers_create(dhcp_gbl_ctx.mctx, 1, 0,
+ &dhcp_gbl_ctx.netmgr, &dhcp_gbl_ctx.taskmgr);
if (result != ISC_R_SUCCESS)
goto cleanup;
- result = isc_socketmgr_createinctx(dhcp_gbl_ctx.mctx,
- &dhcp_gbl_ctx.socketmgr);
+ result = isc_socketmgr_create(dhcp_gbl_ctx.mctx,
+ &dhcp_gbl_ctx.socketmgr);
if (result != ISC_R_SUCCESS)
goto cleanup;
- result = isc_timermgr_createinctx(dhcp_gbl_ctx.mctx,
- &dhcp_gbl_ctx.timermgr);
+ result = isc_timermgr_create(dhcp_gbl_ctx.mctx,
+ &dhcp_gbl_ctx.timermgr);
if (result != ISC_R_SUCCESS)
goto cleanup;
@@ -395,19 +393,19 @@ void dhcp_signal_handler(int signal) {
isc_result_t dns_client_init() {
isc_result_t result;
if (dhcp_gbl_ctx.dnsclient == NULL) {
- result = dns_client_createx(dhcp_gbl_ctx.mctx,
- dhcp_gbl_ctx.actx,
- dhcp_gbl_ctx.taskmgr,
- dhcp_gbl_ctx.socketmgr,
- dhcp_gbl_ctx.timermgr,
- 0,
- &dhcp_gbl_ctx.dnsclient,
- (dhcp_gbl_ctx.use_local4 ?
- &dhcp_gbl_ctx.local4_sockaddr
- : NULL),
- (dhcp_gbl_ctx.use_local6 ?
- &dhcp_gbl_ctx.local6_sockaddr
- : NULL));
+ result = dns_client_create(dhcp_gbl_ctx.mctx,
+ dhcp_gbl_ctx.actx,
+ dhcp_gbl_ctx.taskmgr,
+ dhcp_gbl_ctx.socketmgr,
+ dhcp_gbl_ctx.timermgr,
+ 0,
+ &dhcp_gbl_ctx.dnsclient,
+ (dhcp_gbl_ctx.use_local4 ?
+ &dhcp_gbl_ctx.local4_sockaddr
+ : NULL),
+ (dhcp_gbl_ctx.use_local6 ?
+ &dhcp_gbl_ctx.local6_sockaddr
+ : NULL));
if (result != ISC_R_SUCCESS) {
log_error("Unable to create DNS client context:"
