CVS commit: src/external/mpl/bind/dist/lib/ns
Module Name:src Committed By: christos Date: Fri Apr 19 12:35:28 UTC 2024 Modified Files: src/external/mpl/bind/dist/lib/ns: query.c Log Message: PR/58170: Yoshitaka Tokugawa: Remove blocking statement when the requestor asks for for an address that is in the cache and that access is prevented by a cache acl because the querier has no way to know that this access is denied, so it is not an abuse. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/external/mpl/bind/dist/lib/ns/query.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/ns
Module Name:src
Committed By: christos
Date: Fri Apr 19 12:35:28 UTC 2024
Modified Files:
src/external/mpl/bind/dist/lib/ns: query.c
Log Message:
PR/58170: Yoshitaka Tokugawa: Remove blocking statement when the requestor
asks for for an address that is in the cache and that access is prevented
by a cache acl because the querier has no way to know that this access is
denied, so it is not an abuse.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/mpl/bind/dist/lib/ns/query.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/bind/dist/lib/ns/query.c
diff -u src/external/mpl/bind/dist/lib/ns/query.c:1.20 src/external/mpl/bind/dist/lib/ns/query.c:1.21
--- src/external/mpl/bind/dist/lib/ns/query.c:1.20 Wed Feb 21 17:52:46 2024
+++ src/external/mpl/bind/dist/lib/ns/query.c Fri Apr 19 08:35:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.20 2024/02/21 22:52:46 christos Exp $ */
+/* $NetBSD: query.c,v 1.21 2024/04/19 12:35:28 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -909,7 +909,6 @@ query_checkcacheaccess(ns_client_t *clie
msg);
}
} else {
- pfilter_notify(result, client, "checkcacheaccess");
/*
* We were denied by the "allow-query-cache" ACL.
* There is no need to clear NS_QUERYATTR_CACHEACLOK
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src
Committed By: kre
Date: Sun Apr 14 08:29:54 UTC 2024
Modified Files:
src/external/mpl/bind/lib/plugins: Makefile
Log Message:
Revert previous until Christos has a chance to work out why it breaks
the builds.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/lib/plugins/Makefile
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/bind/lib/plugins/Makefile
diff -u src/external/mpl/bind/lib/plugins/Makefile:1.6 src/external/mpl/bind/lib/plugins/Makefile:1.7
--- src/external/mpl/bind/lib/plugins/Makefile:1.6 Sat Apr 13 17:22:33 2024
+++ src/external/mpl/bind/lib/plugins/Makefile Sun Apr 14 08:29:54 2024
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2024/04/13 17:22:33 christos Exp $
+# $NetBSD: Makefile,v 1.7 2024/04/14 08:29:54 kre Exp $
LIBISMODULE= yes
MAKELINKLIB= no
-.include
-
-.if !defined(MLIBDIR)
LIB= filter-
+.include
SHLIB_MAJOR=0
SRCS= filter-.c
@@ -15,6 +13,5 @@ LIBDIR= /usr/lib/named
DIST=${IDIST}/bin/plugins
.PATH: ${DIST}
-.endif
.include
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src Committed By: kre Date: Sun Apr 14 08:29:54 UTC 2024 Modified Files: src/external/mpl/bind/lib/plugins: Makefile Log Message: Revert previous until Christos has a chance to work out why it breaks the builds. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/lib/plugins/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src
Committed By: christos
Date: Sat Apr 13 17:22:33 UTC 2024
Modified Files:
src/external/mpl/bind/lib/plugins: Makefile
Log Message:
Don't build/install the compat plugin.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/lib/plugins/Makefile
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/bind/lib/plugins/Makefile
diff -u src/external/mpl/bind/lib/plugins/Makefile:1.5 src/external/mpl/bind/lib/plugins/Makefile:1.6
--- src/external/mpl/bind/lib/plugins/Makefile:1.5 Thu Apr 4 21:16:01 2024
+++ src/external/mpl/bind/lib/plugins/Makefile Sat Apr 13 13:22:33 2024
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2024/04/05 01:16:01 christos Exp $
+# $NetBSD: Makefile,v 1.6 2024/04/13 17:22:33 christos Exp $
LIBISMODULE= yes
MAKELINKLIB= no
+.include
+
+.if !defined(MLIBDIR)
LIB= filter-
-.include
SHLIB_MAJOR=0
SRCS= filter-.c
@@ -13,5 +15,6 @@ LIBDIR= /usr/lib/named
DIST=${IDIST}/bin/plugins
.PATH: ${DIST}
+.endif
.include
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src Committed By: christos Date: Sat Apr 13 17:22:33 UTC 2024 Modified Files: src/external/mpl/bind/lib/plugins: Makefile Log Message: Don't build/install the compat plugin. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/lib/plugins/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind
Module Name:src
Committed By: christos
Date: Wed Mar 13 12:56:31 UTC 2024
Modified Files:
src/external/mpl/bind: Makefile.inc
src/external/mpl/bind/include: config.h
Log Message:
centrally control if we are building kerberos
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/mpl/bind/Makefile.inc
cvs rdiff -u -r1.16 -r1.17 src/external/mpl/bind/include/config.h
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/bind/Makefile.inc
diff -u src/external/mpl/bind/Makefile.inc:1.14 src/external/mpl/bind/Makefile.inc:1.15
--- src/external/mpl/bind/Makefile.inc:1.14 Sun Feb 25 13:50:43 2024
+++ src/external/mpl/bind/Makefile.inc Wed Mar 13 08:56:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14 2024/02/25 18:50:43 christos Exp $
+# $NetBSD: Makefile.inc,v 1.15 2024/03/13 12:56:31 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -79,6 +79,7 @@ LIBDPLIBS+= pthread ${NETBSDSRCDIR
.endif
.if ${MKKERBEROS} != "no"
+CPPFLAGS+=-DWITH_KERBEROS
.if !defined (LIB) || empty(LIB)
LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD}
DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD}
Index: src/external/mpl/bind/include/config.h
diff -u src/external/mpl/bind/include/config.h:1.16 src/external/mpl/bind/include/config.h:1.17
--- src/external/mpl/bind/include/config.h:1.16 Wed Feb 21 17:52:52 2024
+++ src/external/mpl/bind/include/config.h Wed Mar 13 08:56:31 2024
@@ -178,6 +178,7 @@
/* Define to 1 if you have the header file. */
#define HAVE_GLOB_H 1
+#ifdef WITH_KERBEROS
/* Define to 1 if you have the Kerberos Framework available */
#define HAVE_GSSAPI 1
@@ -195,6 +196,7 @@
/* Define to 1 if you have the `gss_acquire_cred' function. */
#define HAVE_GSS_ACQUIRE_CRED 1
+#endif
/* Define to 1 if you have the header file. */
/* #undef HAVE_IDN2_H */
@@ -214,6 +216,7 @@
/* Use json-c library */
/* #undef HAVE_JSON_C */
+#ifdef WITH_KERBEROS
/* Define to 1 if you have the header file. */
/* #undef HAVE_KRB5_H */
@@ -222,6 +225,7 @@
/* Define to 1 if you have the header file. */
#define HAVE_KRB5_KRB5_H 1
+#endif
/* Define if libidn2 was found */
/* #undef HAVE_LIBIDN2 */
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Wed Mar 13 12:56:31 UTC 2024 Modified Files: src/external/mpl/bind: Makefile.inc src/external/mpl/bind/include: config.h Log Message: centrally control if we are building kerberos To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/mpl/bind/Makefile.inc cvs rdiff -u -r1.16 -r1.17 src/external/mpl/bind/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/isc/netmgr
Module Name:src Committed By: christos Date: Thu Mar 7 17:10:37 UTC 2024 Modified Files: src/external/mpl/bind/dist/lib/isc/netmgr: netmgr-int.h Log Message: Make sure that the extra field is maximally aligned since it is used for other struct storage. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/isc/netmgr
Module Name:src
Committed By: christos
Date: Thu Mar 7 17:10:37 UTC 2024
Modified Files:
src/external/mpl/bind/dist/lib/isc/netmgr: netmgr-int.h
Log Message:
Make sure that the extra field is maximally aligned since it is used for
other struct storage.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h
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/bind/dist/lib/isc/netmgr/netmgr-int.h
diff -u src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.10 src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.11
--- src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.10 Wed Feb 21 17:52:32 2024
+++ src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h Thu Mar 7 12:10:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: netmgr-int.h,v 1.10 2024/02/21 22:52:32 christos Exp $ */
+/* $NetBSD: netmgr-int.h,v 1.11 2024/03/07 17:10:37 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -276,7 +276,7 @@ struct isc_nmhandle {
LINK(isc_nmhandle_t) active_link;
#endif
void *opaque;
- char extra[];
+ max_align_t extra[];
};
typedef enum isc__netievent_type {
CVS commit: src/external/mpl/bind/lib/libisc
Module Name:src
Committed By: christos
Date: Thu Feb 29 20:41:52 UTC 2024
Modified Files:
src/external/mpl/bind/lib/libisc: Makefile
Log Message:
remove std= override from here. It happens on top of the bind tree.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/mpl/bind/lib/libisc/Makefile
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/bind/lib/libisc/Makefile
diff -u src/external/mpl/bind/lib/libisc/Makefile:1.21 src/external/mpl/bind/lib/libisc/Makefile:1.22
--- src/external/mpl/bind/lib/libisc/Makefile:1.21 Wed Feb 21 17:52:54 2024
+++ src/external/mpl/bind/lib/libisc/Makefile Thu Feb 29 15:41:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2024/02/21 22:52:54 christos Exp $
+# $NetBSD: Makefile,v 1.22 2024/02/29 20:41:52 christos Exp $
NOLINT=yes # XXX
LIB=isc
@@ -9,7 +9,6 @@ LIB=isc
LIBUVDIR=${NETBSDSRCDIR}/external/mit/libuv
LIBUVOBJDIR!= cd ${LIBUVDIR}/lib && ${PRINTOBJDIR}
CPPFLAGS+=-I${LIBUVDIR}/dist/include
-CFLAGS+=-std=gnu18
.include "${.CURDIR}/../Makefile.inc"
CVS commit: src/external/mpl/bind/lib/libisc
Module Name:src Committed By: christos Date: Thu Feb 29 20:41:52 UTC 2024 Modified Files: src/external/mpl/bind/lib/libisc: Makefile Log Message: remove std= override from here. It happens on top of the bind tree. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/external/mpl/bind/lib/libisc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Sun Feb 25 18:50:43 UTC 2024 Modified Files: src/external/mpl/bind: Makefile.inc Log Message: libexecinfo needs libelf. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind
Module Name:src
Committed By: christos
Date: Sun Feb 25 18:50:43 UTC 2024
Modified Files:
src/external/mpl/bind: Makefile.inc
Log Message:
libexecinfo needs libelf.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/Makefile.inc
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/bind/Makefile.inc
diff -u src/external/mpl/bind/Makefile.inc:1.13 src/external/mpl/bind/Makefile.inc:1.14
--- src/external/mpl/bind/Makefile.inc:1.13 Wed Feb 21 17:50:55 2024
+++ src/external/mpl/bind/Makefile.inc Sun Feb 25 13:50:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2024/02/21 22:50:55 christos Exp $
+# $NetBSD: Makefile.inc,v 1.14 2024/02/25 18:50:43 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -55,13 +55,13 @@ DBG=-g3 -gstabs
LDADD+= -lbind9_g -lisccfg_g -ldns_g -lns_g -lirs_g
LDADD+= -lisccc_g -lisc_g
LDADD+= -L${LIBUVOBJDIR} -luv_g
-LDADD+= -lexecinfo_g -lkvm_g -lz_g
+LDADD+= -lexecinfo_g -lelf_g -lkvm_g -lz_g
.else
LDADD+= -lbind9 -lisccfg -ldns -lns -lirs
DPADD+= ${LIBBIND9} ${LIBISCCFG} ${LIBDNS} ${LIBNS} ${LIBIRS}
LDADD+= -lisccc -lisc
LDADD+= -L${LIBUVOBJDIR} -luv
-LDADD+= -lexecinfo -lkvm -lz
+LDADD+= -lexecinfo -lelf -lkvm -lz
DPADD+= ${LIBISCCC} ${LIBISC}
DPADD+= ${LIBUVOBJDIR}/libuv.a
DPADD+= ${LIBEXECINFO} ${LIBKVM} ${LIBZ}
CVS commit: src/external/mpl/bind/dist/lib/ns
Module Name:src
Committed By: christos
Date: Fri Feb 23 21:09:49 UTC 2024
Modified Files:
src/external/mpl/bind/dist/lib/ns: client.c
src/external/mpl/bind/dist/lib/ns/include/ns: client.h
Log Message:
fix 32 bit build (no atomic_*_8)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/mpl/bind/dist/lib/ns/client.c
cvs rdiff -u -r1.15 -r1.16 \
src/external/mpl/bind/dist/lib/ns/include/ns/client.h
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/bind/dist/lib/ns/client.c
diff -u src/external/mpl/bind/dist/lib/ns/client.c:1.19 src/external/mpl/bind/dist/lib/ns/client.c:1.20
--- src/external/mpl/bind/dist/lib/ns/client.c:1.19 Wed Feb 21 17:52:46 2024
+++ src/external/mpl/bind/dist/lib/ns/client.c Fri Feb 23 16:09:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: client.c,v 1.19 2024/02/21 22:52:46 christos Exp $ */
+/* $NetBSD: client.c,v 1.20 2024/02/23 21:09:49 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -118,7 +118,11 @@
#define NS_CLIENT_DROPPORT 1
#endif /* ifndef NS_CLIENT_DROPPORT */
+#ifdef _LP64
atomic_uint_fast64_t ns_client_requests = 0;
+#else
+atomic_uint_fast32_t ns_client_requests = 0;
+#endif
static void
clientmgr_attach(ns_clientmgr_t *source, ns_clientmgr_t **targetp);
Index: src/external/mpl/bind/dist/lib/ns/include/ns/client.h
diff -u src/external/mpl/bind/dist/lib/ns/include/ns/client.h:1.15 src/external/mpl/bind/dist/lib/ns/include/ns/client.h:1.16
--- src/external/mpl/bind/dist/lib/ns/include/ns/client.h:1.15 Wed Feb 21 17:52:46 2024
+++ src/external/mpl/bind/dist/lib/ns/include/ns/client.h Fri Feb 23 16:09:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: client.h,v 1.15 2024/02/21 22:52:46 christos Exp $ */
+/* $NetBSD: client.h,v 1.16 2024/02/23 21:09:49 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -273,7 +273,11 @@ struct ns_client {
*/
#define NS_FAILCACHE_CD 0x01
+#ifdef _LP64
extern atomic_uint_fast64_t ns_client_requests;
+#else
+extern atomic_uint_fast32_t ns_client_requests;
+#endif
/***
*** Functions
CVS commit: src/external/mpl/bind/dist/lib/ns
Module Name:src Committed By: christos Date: Fri Feb 23 21:09:49 UTC 2024 Modified Files: src/external/mpl/bind/dist/lib/ns: client.c src/external/mpl/bind/dist/lib/ns/include/ns: client.h Log Message: fix 32 bit build (no atomic_*_8) To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/external/mpl/bind/dist/lib/ns/client.c cvs rdiff -u -r1.15 -r1.16 \ src/external/mpl/bind/dist/lib/ns/include/ns/client.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/isc/include/isc
Module Name:src
Committed By: christos
Date: Thu Feb 22 12:43:10 UTC 2024
Modified Files:
src/external/mpl/bind/dist/lib/isc/include/isc: types.h
Log Message:
Use 32 bit counters on non _LP64 machines because they don't have 64 bit
atomics.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mpl/bind/dist/lib/isc/include/isc/types.h
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/bind/dist/lib/isc/include/isc/types.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/types.h:1.11 src/external/mpl/bind/dist/lib/isc/include/isc/types.h:1.12
--- src/external/mpl/bind/dist/lib/isc/include/isc/types.h:1.11 Wed Feb 21 17:52:31 2024
+++ src/external/mpl/bind/dist/lib/isc/include/isc/types.h Thu Feb 22 07:43:10 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.11 2024/02/21 22:52:31 christos Exp $ */
+/* $NetBSD: types.h,v 1.12 2024/02/22 12:43:10 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -78,8 +78,13 @@ typedef struct isc_sockaddr isc_sockadd
typedef ISC_LIST(isc_sockaddr_t) isc_sockaddrlist_t; /*%< Socket Address List
* */
typedef struct isc_statsisc_stats_t; /*%< Statistics */
+#ifdef _LP64
typedef int_fast64_t isc_statscounter_t;
typedef atomic_int_fast64_t isc_atomic_statscounter_t;
+#else
+typedef int_fast32_t isc_statscounter_t;
+typedef atomic_int_fast32_t isc_atomic_statscounter_t;
+#endif
typedef struct isc_symtab isc_symtab_t; /*%< Symbol Table */
typedef struct isc_task isc_task_t; /*%< Task */
typedef ISC_LIST(isc_task_t) isc_tasklist_t; /*%< Task List */
CVS commit: src/external/mpl/bind/dist/lib/isc/include/isc
Module Name:src Committed By: christos Date: Thu Feb 22 12:43:10 UTC 2024 Modified Files: src/external/mpl/bind/dist/lib/isc/include/isc: types.h Log Message: Use 32 bit counters on non _LP64 machines because they don't have 64 bit atomics. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/external/mpl/bind/dist/lib/isc/include/isc/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/bin/dnssec/dnssec-cds
Module Name:src Committed By: christos Date: Thu Feb 22 01:10:55 UTC 2024 Added Files: src/external/mpl/bind/bin/dnssec/dnssec-cds: Makefile Log Message: new Makefile To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/bin/dnssec/dnssec-cds/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/bin/dnssec/dnssec-cds
Module Name:src
Committed By: christos
Date: Thu Feb 22 01:10:55 UTC 2024
Added Files:
src/external/mpl/bind/bin/dnssec/dnssec-cds: Makefile
Log Message:
new Makefile
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/bin/dnssec/dnssec-cds/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mpl/bind/bin/dnssec/dnssec-cds/Makefile
diff -u /dev/null src/external/mpl/bind/bin/dnssec/dnssec-cds/Makefile:1.1
--- /dev/null Wed Feb 21 20:10:55 2024
+++ src/external/mpl/bind/bin/dnssec/dnssec-cds/Makefile Wed Feb 21 20:10:54 2024
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2024/02/22 01:10:54 christos Exp $
+
+BASE= ${.CURDIR:T}
+MAN=${BASE}.1
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.include
CVS commit: src/external/mpl/bind/bin/dnssec
Module Name:src Committed By: christos Date: Thu Feb 22 01:10:37 UTC 2024 Modified Files: src/external/mpl/bind/bin/dnssec: Makefile Log Message: new tool To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/dnssec/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/bin/dnssec
Module Name:src Committed By: christos Date: Thu Feb 22 01:10:37 UTC 2024 Modified Files: src/external/mpl/bind/bin/dnssec: Makefile Log Message: new tool To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/dnssec/Makefile 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/bind/bin/dnssec/Makefile diff -u src/external/mpl/bind/bin/dnssec/Makefile:1.1 src/external/mpl/bind/bin/dnssec/Makefile:1.2 --- src/external/mpl/bind/bin/dnssec/Makefile:1.1 Sun Aug 12 09:02:25 2018 +++ src/external/mpl/bind/bin/dnssec/Makefile Wed Feb 21 20:10:37 2024 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2018/08/12 13:02:25 christos Exp $ +# $NetBSD: Makefile,v 1.2 2024/02/22 01:10:37 christos Exp $ -SUBDIR= dnssec-dsfromkey dnssec-keyfromlabel dnssec-keygen dnssec-signzone \ - dnssec-settime dnssec-revoke dnssec-verify dnssec-importkey +SUBDIR= dnssec-cds dnssec-dsfromkey dnssec-keyfromlabel dnssec-keygen \ +dnssec-signzone dnssec-settime dnssec-revoke dnssec-verify dnssec-importkey .include "Makefile.inc"
CVS commit: src/external/mpl/bind/bin/tools
Module Name:src
Committed By: christos
Date: Thu Feb 22 00:59:45 UTC 2024
Modified Files:
src/external/mpl/bind/bin/tools: Makefile
Added Files:
src/external/mpl/bind/bin/tools/mdig: Makefile
src/external/mpl/bind/bin/tools/named-rrchecker: Makefile
Log Message:
add mdig and named-rrchecker
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/bin/tools/mdig/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mpl/bind/bin/tools/named-rrchecker/Makefile
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/bind/bin/tools/Makefile
diff -u src/external/mpl/bind/bin/tools/Makefile:1.1 src/external/mpl/bind/bin/tools/Makefile:1.2
--- src/external/mpl/bind/bin/tools/Makefile:1.1 Sun Aug 12 09:02:26 2018
+++ src/external/mpl/bind/bin/tools/Makefile Wed Feb 21 19:59:44 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2018/08/12 13:02:26 christos Exp $
+# $NetBSD: Makefile,v 1.2 2024/02/22 00:59:44 christos Exp $
-SUBDIR= arpaname named-journalprint nsec3hash
+SUBDIR= arpaname mdig named-journalprint named-rrchecker nsec3hash
.include "Makefile.inc"
Added files:
Index: src/external/mpl/bind/bin/tools/mdig/Makefile
diff -u /dev/null src/external/mpl/bind/bin/tools/mdig/Makefile:1.1
--- /dev/null Wed Feb 21 19:59:45 2024
+++ src/external/mpl/bind/bin/tools/mdig/Makefile Wed Feb 21 19:59:44 2024
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2024/02/22 00:59:44 christos Exp $
+
+BASE= ${.CURDIR:T}
+BINDIR= /usr/bin
+
+.include "${.CURDIR}/../Makefile.inc"
+
+foo:
+ echo x${BINDIR}x
+
+.include
Index: src/external/mpl/bind/bin/tools/named-rrchecker/Makefile
diff -u /dev/null src/external/mpl/bind/bin/tools/named-rrchecker/Makefile:1.1
--- /dev/null Wed Feb 21 19:59:45 2024
+++ src/external/mpl/bind/bin/tools/named-rrchecker/Makefile Wed Feb 21 19:59:45 2024
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2024/02/22 00:59:45 christos Exp $
+
+BASE= ${.CURDIR:T}
+BINDIR= /usr/sbin
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.include
CVS commit: src/external/mpl/bind/bin/tools
Module Name:src Committed By: christos Date: Thu Feb 22 00:59:45 UTC 2024 Modified Files: src/external/mpl/bind/bin/tools: Makefile Added Files: src/external/mpl/bind/bin/tools/mdig: Makefile src/external/mpl/bind/bin/tools/named-rrchecker: Makefile Log Message: add mdig and named-rrchecker To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/tools/Makefile cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/bin/tools/mdig/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mpl/bind/bin/tools/named-rrchecker/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/isc/netmgr
Module Name:src Committed By: christos Date: Tue Feb 13 15:34:22 UTC 2024 Modified Files: src/external/mpl/bind/dist/lib/isc/netmgr: netmgr.c Log Message: make things compile again. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/isc/netmgr
Module Name:src
Committed By: christos
Date: Tue Feb 13 15:34:22 UTC 2024
Modified Files:
src/external/mpl/bind/dist/lib/isc/netmgr: netmgr.c
Log Message:
make things compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.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/bind/dist/lib/isc/netmgr/netmgr.c
diff -u src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c:1.11 src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c:1.12
--- src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c:1.11 Tue Feb 13 10:27:20 2024
+++ src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c Tue Feb 13 10:34:22 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: netmgr.c,v 1.11 2024/02/13 15:27:20 christos Exp $ */
+/* $NetBSD: netmgr.c,v 1.12 2024/02/13 15:34:22 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -360,7 +360,7 @@ isc__netmgr_create(isc_mem_t *mctx, uint
mgr->workers_running++;
isc_thread_create(nm_thread, >workers[i], >thread);
- snprintf(name, sizeof(name), "net-%zu", i);
+ snprintf(name, sizeof(name), "net-%d", i);
isc_thread_setname(worker->thread, name);
}
CVS commit: src/external/mpl/bind/dist/lib
Module Name:src Committed By: christos Date: Tue Feb 13 15:27:21 UTC 2024 Modified Files: src/external/mpl/bind/dist/lib/dns: dst_api.c resolver.c validator.c src/external/mpl/bind/dist/lib/dns/include/dns: validator.h src/external/mpl/bind/dist/lib/dns/include/dst: dst.h src/external/mpl/bind/dist/lib/isc/include/isc: netmgr.h src/external/mpl/bind/dist/lib/isc/netmgr: netmgr-int.h netmgr.c tcp.c tcpdns.c udp.c Log Message: Apply patch for CVE-2023-50387 and CVE-2023-50868: No public information has been posted (that I can find) To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/lib/dns/dst_api.c \ src/external/mpl/bind/dist/lib/dns/validator.c cvs rdiff -u -r1.17 -r1.18 src/external/mpl/bind/dist/lib/dns/resolver.c cvs rdiff -u -r1.7 -r1.8 \ src/external/mpl/bind/dist/lib/dns/include/dns/validator.h cvs rdiff -u -r1.9 -r1.10 \ src/external/mpl/bind/dist/lib/dns/include/dst/dst.h cvs rdiff -u -r1.7 -r1.8 \ src/external/mpl/bind/dist/lib/isc/include/isc/netmgr.h cvs rdiff -u -r1.8 -r1.9 \ src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h \ src/external/mpl/bind/dist/lib/isc/netmgr/tcp.c \ src/external/mpl/bind/dist/lib/isc/netmgr/tcpdns.c cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c cvs rdiff -u -r1.11 -r1.12 src/external/mpl/bind/dist/lib/isc/netmgr/udp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib
Module Name:src
Committed By: christos
Date: Tue Feb 13 15:27:21 UTC 2024
Modified Files:
src/external/mpl/bind/dist/lib/dns: dst_api.c resolver.c validator.c
src/external/mpl/bind/dist/lib/dns/include/dns: validator.h
src/external/mpl/bind/dist/lib/dns/include/dst: dst.h
src/external/mpl/bind/dist/lib/isc/include/isc: netmgr.h
src/external/mpl/bind/dist/lib/isc/netmgr: netmgr-int.h netmgr.c tcp.c
tcpdns.c udp.c
Log Message:
Apply patch for CVE-2023-50387 and CVE-2023-50868:
No public information has been posted (that I can find)
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/lib/dns/dst_api.c \
src/external/mpl/bind/dist/lib/dns/validator.c
cvs rdiff -u -r1.17 -r1.18 src/external/mpl/bind/dist/lib/dns/resolver.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/mpl/bind/dist/lib/dns/include/dns/validator.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/mpl/bind/dist/lib/dns/include/dst/dst.h
cvs rdiff -u -r1.7 -r1.8 \
src/external/mpl/bind/dist/lib/isc/include/isc/netmgr.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h \
src/external/mpl/bind/dist/lib/isc/netmgr/tcp.c \
src/external/mpl/bind/dist/lib/isc/netmgr/tcpdns.c
cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c
cvs rdiff -u -r1.11 -r1.12 src/external/mpl/bind/dist/lib/isc/netmgr/udp.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/bind/dist/lib/dns/dst_api.c
diff -u src/external/mpl/bind/dist/lib/dns/dst_api.c:1.13 src/external/mpl/bind/dist/lib/dns/dst_api.c:1.14
--- src/external/mpl/bind/dist/lib/dns/dst_api.c:1.13 Wed Jan 25 16:43:30 2023
+++ src/external/mpl/bind/dist/lib/dns/dst_api.c Tue Feb 13 10:27:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dst_api.c,v 1.13 2023/01/25 21:43:30 christos Exp $ */
+/* $NetBSD: dst_api.c,v 1.14 2024/02/13 15:27:20 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -166,7 +166,8 @@ computeid(dst_key_t *key);
static isc_result_t
frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags,
unsigned int protocol, dns_rdataclass_t rdclass,
- isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp);
+ isc_buffer_t *source, isc_mem_t *mctx, bool no_rdata,
+ dst_key_t **keyp);
static isc_result_t
algorithm_status(unsigned int alg);
@@ -782,6 +783,13 @@ dst_key_todns(const dst_key_t *key, isc_
isc_result_t
dst_key_fromdns(const dns_name_t *name, dns_rdataclass_t rdclass,
isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) {
+ return (dst_key_fromdns_ex(name, rdclass, source, mctx, false, keyp));
+}
+
+isc_result_t
+dst_key_fromdns_ex(const dns_name_t *name, dns_rdataclass_t rdclass,
+ isc_buffer_t *source, isc_mem_t *mctx, bool no_rdata,
+ dst_key_t **keyp) {
uint8_t alg, proto;
uint32_t flags, extflags;
dst_key_t *key = NULL;
@@ -812,7 +820,7 @@ dst_key_fromdns(const dns_name_t *name,
}
result = frombuffer(name, alg, flags, proto, rdclass, source, mctx,
- );
+ no_rdata, );
if (result != ISC_R_SUCCESS) {
return (result);
}
@@ -833,7 +841,7 @@ dst_key_frombuffer(const dns_name_t *nam
REQUIRE(dst_initialized);
result = frombuffer(name, alg, flags, protocol, rdclass, source, mctx,
- );
+ false, );
if (result != ISC_R_SUCCESS) {
return (result);
}
@@ -2339,7 +2347,8 @@ computeid(dst_key_t *key) {
static isc_result_t
frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags,
unsigned int protocol, dns_rdataclass_t rdclass,
- isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) {
+ isc_buffer_t *source, isc_mem_t *mctx, bool no_rdata,
+ dst_key_t **keyp) {
dst_key_t *key;
isc_result_t ret;
@@ -2364,10 +2373,12 @@ frombuffer(const dns_name_t *name, unsig
return (DST_R_UNSUPPORTEDALG);
}
- ret = key->func->fromdns(key, source);
- if (ret != ISC_R_SUCCESS) {
- dst_key_free();
- return (ret);
+ if (!no_rdata) {
+ ret = key->func->fromdns(key, source);
+ if (ret != ISC_R_SUCCESS) {
+dst_key_free();
+return (ret);
+ }
}
}
Index: src/external/mpl/bind/dist/lib/dns/validator.c
diff -u src/external/mpl/bind/dist/lib/dns/validator.c:1.13 src/external/mpl/bind/dist/lib/dns/validator.c:1.14
--- src/external/mpl/bind/dist/lib/dns/validator.c:1.13 Mon Jun 26 18:03:00 2023
+++ src/external/mpl/bind/dist/lib/dns/validator.c Tue Feb 13 10:27:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: validator.c,v 1.13 2023/06/26 22:03:00 christos Exp $ */
+/* $NetBSD: validator.c,v 1.14 2024/02/13 15:27:20 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1106,8 +1106,8 @@ create_validator(dns_validator_t *val, d
* 'rdataset'. If found, build a dst_key_t for it and point val->key at
* it.
*
- * If val->key is already
CVS commit: src/external/mpl/bind/dist/lib/dns
Module Name:src
Committed By: christos
Date: Tue Feb 13 15:24:47 UTC 2024
Modified Files:
src/external/mpl/bind/dist/lib/dns: mapapi rbt.c rbtdb.c
src/external/mpl/bind/dist/lib/dns/include/dns: rbt.h
Log Message:
Apply patch for CVE-2023-6516:
To keep its cache database efficient, `named` running as a recursive
resolver occasionally attempts to clean up the database. It uses
several methods, including some that are asynchronous: a small
chunk of memory pointing to the cache element that can be cleaned
up is first allocated and then queued for later processing. It was
discovered that if the resolver is continuously processing query
patterns triggering this type of cache-database maintenance, `named`
may not be able to handle the cleanup events in a timely manner.
This in turn enables the list of queued cleanup events to grow
infinitely large over time, allowing the configured `max-cache-size`
limit to be significantly exceeded. This issue affects BIND 9
versions 9.16.0 through 9.16.45 and 9.16.8-S1 through 9.16.45-S1.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/dns/mapapi
cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/lib/dns/rbt.c
cvs rdiff -u -r1.17 -r1.18 src/external/mpl/bind/dist/lib/dns/rbtdb.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/dns/include/dns/rbt.h
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/bind/dist/lib/dns/mapapi
diff -u src/external/mpl/bind/dist/lib/dns/mapapi:1.2 src/external/mpl/bind/dist/lib/dns/mapapi:1.3
--- src/external/mpl/bind/dist/lib/dns/mapapi:1.2 Fri Aug 20 09:20:28 2021
+++ src/external/mpl/bind/dist/lib/dns/mapapi Tue Feb 13 10:24:47 2024
@@ -13,4 +13,4 @@
# Whenever releasing a new major release of BIND9, set this value
# back to 1.0 when releasing the first alpha. Map files are *never*
# compatible across major releases.
-MAPAPI=3.0
+MAPAPI=4.0
Index: src/external/mpl/bind/dist/lib/dns/rbt.c
diff -u src/external/mpl/bind/dist/lib/dns/rbt.c:1.13 src/external/mpl/bind/dist/lib/dns/rbt.c:1.14
--- src/external/mpl/bind/dist/lib/dns/rbt.c:1.13 Mon Jun 26 18:03:00 2023
+++ src/external/mpl/bind/dist/lib/dns/rbt.c Tue Feb 13 10:24:47 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: rbt.c,v 1.13 2023/06/26 22:03:00 christos Exp $ */
+/* $NetBSD: rbt.c,v 1.14 2024/02/13 15:24:47 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -2310,6 +2310,7 @@ create_node(isc_mem_t *mctx, const dns_n
HASHVAL(node) = 0;
ISC_LINK_INIT(node, deadlink);
+ ISC_LINK_INIT(node, prunelink);
LOCKNUM(node) = 0;
WILD(node) = 0;
Index: src/external/mpl/bind/dist/lib/dns/rbtdb.c
diff -u src/external/mpl/bind/dist/lib/dns/rbtdb.c:1.17 src/external/mpl/bind/dist/lib/dns/rbtdb.c:1.18
--- src/external/mpl/bind/dist/lib/dns/rbtdb.c:1.17 Mon Jun 26 18:03:00 2023
+++ src/external/mpl/bind/dist/lib/dns/rbtdb.c Tue Feb 13 10:24:47 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: rbtdb.c,v 1.17 2023/06/26 22:03:00 christos Exp $ */
+/* $NetBSD: rbtdb.c,v 1.18 2024/02/13 15:24:47 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -523,6 +523,10 @@ struct dns_rbtdb {
*/
rbtnodelist_t *deadnodes;
+ /* List of nodes from which recursive tree pruning can be started from.
+ * Locked by tree_lock. */
+ rbtnodelist_t prunenodes;
+
/*
* Heaps. These are used for TTL based expiry in a cache,
* or for zone resigning in a zone DB. hmctx is the memory
@@ -1069,6 +1073,7 @@ free_rbtdb(dns_rbtdb_t *rbtdb, bool log,
unsigned int i;
isc_result_t result;
char buf[DNS_NAME_FORMATSIZE];
+ dns_rbtnode_t *node = NULL;
dns_rbt_t **treep;
isc_time_t start;
@@ -1094,8 +1099,6 @@ free_rbtdb(dns_rbtdb_t *rbtdb, bool log,
* the overhead of unlinking all nodes here should be negligible.
*/
for (i = 0; i < rbtdb->node_lock_count; i++) {
- dns_rbtnode_t *node;
-
node = ISC_LIST_HEAD(rbtdb->deadnodes[i]);
while (node != NULL) {
ISC_LIST_UNLINK(rbtdb->deadnodes[i], node, deadlink);
@@ -1103,6 +1106,12 @@ free_rbtdb(dns_rbtdb_t *rbtdb, bool log,
}
}
+ node = ISC_LIST_HEAD(rbtdb->prunenodes);
+ while (node != NULL) {
+ ISC_LIST_UNLINK(rbtdb->prunenodes, node, prunelink);
+ node = ISC_LIST_HEAD(rbtdb->prunenodes);
+ }
+
if (event == NULL) {
rbtdb->quantum = (rbtdb->task != NULL) ? 100 : 0;
}
@@ -1937,19 +1946,32 @@ is_leaf(dns_rbtnode_t *node) {
node->left == NULL && node->right == NULL);
}
+/*%
+ * The tree lock must be held when this function is called as it reads and
+ * updates rbtdb->prunenodes.
+ */
static void
send_to_prune_tree(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,
isc_rwlocktype_t locktype) {
- isc_event_t *ev;
- dns_db_t *db;
+ bool pruning_queued = (ISC_LIST_HEAD(rbtdb->prunenodes) != NULL);
+
+ INSIST(locktype == isc_rwlocktype_write);
- ev = isc_event_allocate(rbtdb->common.mctx,
CVS commit: src/external/mpl/bind/dist/lib/dns
Module Name:src Committed By: christos Date: Tue Feb 13 15:24:47 UTC 2024 Modified Files: src/external/mpl/bind/dist/lib/dns: mapapi rbt.c rbtdb.c src/external/mpl/bind/dist/lib/dns/include/dns: rbt.h Log Message: Apply patch for CVE-2023-6516: To keep its cache database efficient, `named` running as a recursive resolver occasionally attempts to clean up the database. It uses several methods, including some that are asynchronous: a small chunk of memory pointing to the cache element that can be cleaned up is first allocated and then queued for later processing. It was discovered that if the resolver is continuously processing query patterns triggering this type of cache-database maintenance, `named` may not be able to handle the cleanup events in a timely manner. This in turn enables the list of queued cleanup events to grow infinitely large over time, allowing the configured `max-cache-size` limit to be significantly exceeded. This issue affects BIND 9 versions 9.16.0 through 9.16.45 and 9.16.8-S1 through 9.16.45-S1. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/dns/mapapi cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/lib/dns/rbt.c cvs rdiff -u -r1.17 -r1.18 src/external/mpl/bind/dist/lib/dns/rbtdb.c cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/dns/include/dns/rbt.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/ns
Module Name:src Committed By: christos Date: Tue Feb 13 15:23:16 UTC 2024 Modified Files: src/external/mpl/bind/dist/lib/ns: query.c Log Message: Apply patch for CVE-2023-5679: A bad interaction between DNS64 and serve-stale may cause `named` to crash with an assertion failure during recursive resolution, when both of these features are enabled. This issue affects BIND 9 versions 9.16.12 through 9.16.45, 9.18.0 through 9.18.21, 9.19.0 through 9.19.19, 9.16.12-S1 through 9.16.45-S1, and 9.18.11-S1 through 9.18.21-S1. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/external/mpl/bind/dist/lib/ns/query.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/ns
Module Name:src
Committed By: christos
Date: Tue Feb 13 15:23:16 UTC 2024
Modified Files:
src/external/mpl/bind/dist/lib/ns: query.c
Log Message:
Apply patch for CVE-2023-5679:
A bad interaction between DNS64 and serve-stale may cause `named`
to crash with an assertion failure during recursive resolution,
when both of these features are enabled. This issue affects BIND
9 versions 9.16.12 through 9.16.45, 9.18.0 through 9.18.21, 9.19.0
through 9.19.19, 9.16.12-S1 through 9.16.45-S1, and 9.18.11-S1
through 9.18.21-S1.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/mpl/bind/dist/lib/ns/query.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/bind/dist/lib/ns/query.c
diff -u src/external/mpl/bind/dist/lib/ns/query.c:1.18 src/external/mpl/bind/dist/lib/ns/query.c:1.19
--- src/external/mpl/bind/dist/lib/ns/query.c:1.18 Tue Feb 13 10:22:03 2024
+++ src/external/mpl/bind/dist/lib/ns/query.c Tue Feb 13 10:23:15 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.18 2024/02/13 15:22:03 christos Exp $ */
+/* $NetBSD: query.c,v 1.19 2024/02/13 15:23:15 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -6102,6 +6102,13 @@ query_lookup_stale(ns_client_t *client)
query_ctx_t qctx;
qctx_init(client, NULL, client->query.qtype, );
+ if (DNS64(client)) {
+ qctx.qtype = qctx.type = dns_rdatatype_a;
+ qctx.dns64 = true;
+ }
+ if (DNS64EXCLUDE(client)) {
+ qctx.dns64_exclude = true;
+ }
dns_db_attach(client->view->cachedb, );
client->query.attributes &= ~NS_QUERYATTR_RECURSIONOK;
client->query.dboptions |= DNS_DBFIND_STALETIMEOUT;
CVS commit: src/external/mpl/bind/dist/lib/ns
Module Name:src
Committed By: christos
Date: Tue Feb 13 15:22:03 UTC 2024
Modified Files:
src/external/mpl/bind/dist/lib/ns: query.c
Log Message:
Apply patch for CVE-2023-5517:
A flaw in query-handling code can cause `named` to exit prematurely
with an assertion failure when: - `nxdomain-redirect ;` is
configured, and - the resolver receives a PTR query for an RFC 1918
address that would normally result in an authoritative NXDOMAIN
response. This issue affects BIND 9 versions 9.12.0 through 9.16.45,
9.18.0 through 9.18.21, 9.19.0 through 9.19.19, 9.16.8-S1 through
9.16.45-S1, and 9.18.11-S1 through 9.18.21-S1.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/mpl/bind/dist/lib/ns/query.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/bind/dist/lib/ns/query.c
diff -u src/external/mpl/bind/dist/lib/ns/query.c:1.17 src/external/mpl/bind/dist/lib/ns/query.c:1.18
--- src/external/mpl/bind/dist/lib/ns/query.c:1.17 Mon Jun 26 18:03:01 2023
+++ src/external/mpl/bind/dist/lib/ns/query.c Tue Feb 13 10:22:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.17 2023/06/26 22:03:01 christos Exp $ */
+/* $NetBSD: query.c,v 1.18 2024/02/13 15:22:03 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -459,10 +459,10 @@ static void
query_addnxrrsetnsec(query_ctx_t *qctx);
static isc_result_t
-query_nxdomain(query_ctx_t *qctx, bool empty_wild);
+query_nxdomain(query_ctx_t *qctx, isc_result_t result);
static isc_result_t
-query_redirect(query_ctx_t *qctx);
+query_redirect(query_ctx_t *qctx, isc_result_t result);
static isc_result_t
query_ncache(query_ctx_t *qctx, isc_result_t result);
@@ -7352,8 +7352,7 @@ query_usestale(query_ctx_t *qctx, isc_re
* result from the search.
*/
static isc_result_t
-query_gotanswer(query_ctx_t *qctx, isc_result_t res) {
- isc_result_t result = res;
+query_gotanswer(query_ctx_t *qctx, isc_result_t result) {
char errmsg[256];
CCTRACE(ISC_LOG_DEBUG(3), "query_gotanswer");
@@ -7423,16 +7422,16 @@ root_key_sentinel:
return (query_nodata(qctx, DNS_R_NXRRSET));
case DNS_R_EMPTYWILD:
- return (query_nxdomain(qctx, true));
+ return (query_nxdomain(qctx, DNS_R_EMPTYWILD));
case DNS_R_NXDOMAIN:
- return (query_nxdomain(qctx, false));
+ return (query_nxdomain(qctx, DNS_R_NXDOMAIN));
case DNS_R_COVERINGNSEC:
return (query_coveringnsec(qctx));
case DNS_R_NCACHENXDOMAIN:
- result = query_redirect(qctx);
+ result = query_redirect(qctx, result);
if (result != ISC_R_COMPLETE) {
return (result);
}
@@ -9250,10 +9249,10 @@ query_addnxrrsetnsec(query_ctx_t *qctx)
* Handle NXDOMAIN and empty wildcard responses.
*/
static isc_result_t
-query_nxdomain(query_ctx_t *qctx, bool empty_wild) {
+query_nxdomain(query_ctx_t *qctx, isc_result_t result) {
dns_section_t section;
uint32_t ttl;
- isc_result_t result;
+ bool empty_wild = (result == DNS_R_EMPTYWILD);
CCTRACE(ISC_LOG_DEBUG(3), "query_nxdomain");
@@ -9262,7 +9261,7 @@ query_nxdomain(query_ctx_t *qctx, bool e
INSIST(qctx->is_zone || REDIRECT(qctx->client));
if (!empty_wild) {
- result = query_redirect(qctx);
+ result = query_redirect(qctx, result);
if (result != ISC_R_COMPLETE) {
return (result);
}
@@ -9350,7 +9349,7 @@ cleanup:
* redirecting, so query processing should continue past it.
*/
static isc_result_t
-query_redirect(query_ctx_t *qctx) {
+query_redirect(query_ctx_t *qctx, isc_result_t saved_result) {
isc_result_t result;
CCTRACE(ISC_LOG_DEBUG(3), "query_redirect");
@@ -9391,7 +9390,7 @@ query_redirect(query_ctx_t *qctx) {
SAVE(qctx->client->query.redirect.rdataset, qctx->rdataset);
SAVE(qctx->client->query.redirect.sigrdataset,
qctx->sigrdataset);
- qctx->client->query.redirect.result = DNS_R_NCACHENXDOMAIN;
+ qctx->client->query.redirect.result = saved_result;
dns_name_copynf(qctx->fname,
qctx->client->query.redirect.fname);
qctx->client->query.redirect.authoritative =
@@ -10006,7 +10005,7 @@ query_coveringnsec(query_ctx_t *qctx) {
* We now have the proof that we have an NXDOMAIN. Apply
* NXDOMAIN redirection if configured.
*/
- result = query_redirect(qctx);
+ result = query_redirect(qctx, DNS_R_COVERINGNSEC);
if (result != ISC_R_COMPLETE) {
redirected = true;
goto cleanup;
CVS commit: src/external/mpl/bind/dist/lib/ns
Module Name:src Committed By: christos Date: Tue Feb 13 15:22:03 UTC 2024 Modified Files: src/external/mpl/bind/dist/lib/ns: query.c Log Message: Apply patch for CVE-2023-5517: A flaw in query-handling code can cause `named` to exit prematurely with an assertion failure when: - `nxdomain-redirect ;` is configured, and - the resolver receives a PTR query for an RFC 1918 address that would normally result in an authoritative NXDOMAIN response. This issue affects BIND 9 versions 9.12.0 through 9.16.45, 9.18.0 through 9.18.21, 9.19.0 through 9.19.19, 9.16.8-S1 through 9.16.45-S1, and 9.18.11-S1 through 9.18.21-S1. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/mpl/bind/dist/lib/ns/query.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist
Module Name:src Committed By: christos Date: Tue Feb 13 15:21:10 UTC 2024 Modified Files: src/external/mpl/bind/dist/bin/plugins: filter-.c src/external/mpl/bind/dist/lib/dns: catz.c message.c name.c rpz.c src/external/mpl/bind/dist/lib/dns/include/dns: message.h name.h src/external/mpl/bind/dist/lib/dns/win32: libdns.def.in src/external/mpl/bind/dist/lib/isc: ht.c src/external/mpl/bind/dist/lib/isc/include/isc: ht.h src/external/mpl/bind/dist/lib/isc/tests: ht_test.c Log Message: Apply patch for CVE-2023-4408: The DNS message parsing code in `named` includes a section whose computational complexity is overly high. It does not cause problems for typical DNS traffic, but crafted queries and responses may cause excessive CPU load on the affected `named` instance by exploiting this flaw. This issue affects both authoritative servers and recursive resolvers. This issue affects BIND 9 versions 9.0.0 through 9.16.45, 9.18.0 through 9.18.21, 9.19.0 through 9.19.19, 9.9.3-S1 through 9.11.37-S1, 9.16.8-S1 through 9.16.45-S1, and 9.18.11-S1 through 9.18.21-S1. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/bin/plugins/filter-.c cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/lib/dns/catz.c cvs rdiff -u -r1.15 -r1.16 src/external/mpl/bind/dist/lib/dns/message.c cvs rdiff -u -r1.12 -r1.13 src/external/mpl/bind/dist/lib/dns/name.c cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/lib/dns/rpz.c cvs rdiff -u -r1.11 -r1.12 \ src/external/mpl/bind/dist/lib/dns/include/dns/message.h cvs rdiff -u -r1.9 -r1.10 \ src/external/mpl/bind/dist/lib/dns/include/dns/name.h cvs rdiff -u -r1.1.1.12 -r1.2 \ src/external/mpl/bind/dist/lib/dns/win32/libdns.def.in cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/isc/ht.c cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/isc/include/isc/ht.h cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/isc/tests/ht_test.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist
Module Name:src
Committed By: christos
Date: Tue Feb 13 15:21:10 UTC 2024
Modified Files:
src/external/mpl/bind/dist/bin/plugins: filter-.c
src/external/mpl/bind/dist/lib/dns: catz.c message.c name.c rpz.c
src/external/mpl/bind/dist/lib/dns/include/dns: message.h name.h
src/external/mpl/bind/dist/lib/dns/win32: libdns.def.in
src/external/mpl/bind/dist/lib/isc: ht.c
src/external/mpl/bind/dist/lib/isc/include/isc: ht.h
src/external/mpl/bind/dist/lib/isc/tests: ht_test.c
Log Message:
Apply patch for CVE-2023-4408:
The DNS message parsing code in `named` includes a section whose
computational complexity is overly high. It does not cause problems
for typical DNS traffic, but crafted queries and responses may
cause excessive CPU load on the affected `named` instance by
exploiting this flaw. This issue affects both authoritative servers
and recursive resolvers. This issue affects BIND 9 versions 9.0.0
through 9.16.45, 9.18.0 through 9.18.21, 9.19.0 through 9.19.19,
9.9.3-S1 through 9.11.37-S1, 9.16.8-S1 through 9.16.45-S1, and
9.18.11-S1 through 9.18.21-S1.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/bin/plugins/filter-.c
cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/lib/dns/catz.c
cvs rdiff -u -r1.15 -r1.16 src/external/mpl/bind/dist/lib/dns/message.c
cvs rdiff -u -r1.12 -r1.13 src/external/mpl/bind/dist/lib/dns/name.c
cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/lib/dns/rpz.c
cvs rdiff -u -r1.11 -r1.12 \
src/external/mpl/bind/dist/lib/dns/include/dns/message.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/mpl/bind/dist/lib/dns/include/dns/name.h
cvs rdiff -u -r1.1.1.12 -r1.2 \
src/external/mpl/bind/dist/lib/dns/win32/libdns.def.in
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/isc/ht.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/isc/include/isc/ht.h
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/isc/tests/ht_test.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/bind/dist/bin/plugins/filter-.c
diff -u src/external/mpl/bind/dist/bin/plugins/filter-.c:1.8 src/external/mpl/bind/dist/bin/plugins/filter-.c:1.9
--- src/external/mpl/bind/dist/bin/plugins/filter-.c:1.8 Wed Jan 25 16:43:24 2023
+++ src/external/mpl/bind/dist/bin/plugins/filter-.c Tue Feb 13 10:21:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: filter-.c,v 1.8 2023/01/25 21:43:24 christos Exp $ */
+/* $NetBSD: filter-.c,v 1.9 2024/02/13 15:21:09 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -352,7 +352,7 @@ plugin_register(const char *parameters,
cfg_line, mctx, lctx, actx));
}
- isc_ht_init(>ht, mctx, 16);
+ isc_ht_init(>ht, mctx, 16, ISC_HT_CASE_SENSITIVE);
isc_mutex_init(>hlock);
/*
Index: src/external/mpl/bind/dist/lib/dns/catz.c
diff -u src/external/mpl/bind/dist/lib/dns/catz.c:1.10 src/external/mpl/bind/dist/lib/dns/catz.c:1.11
--- src/external/mpl/bind/dist/lib/dns/catz.c:1.10 Mon Jun 26 18:03:00 2023
+++ src/external/mpl/bind/dist/lib/dns/catz.c Tue Feb 13 10:21:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: catz.c,v 1.10 2023/06/26 22:03:00 christos Exp $ */
+/* $NetBSD: catz.c,v 1.11 2024/02/13 15:21:09 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -425,9 +425,9 @@ dns_catz_zones_merge(dns_catz_zone_t *ta
dns_name_format(>name, czname, DNS_NAME_FORMATSIZE);
- isc_ht_init(, target->catzs->mctx, 16);
+ isc_ht_init(, target->catzs->mctx, 16, ISC_HT_CASE_SENSITIVE);
- isc_ht_init(, target->catzs->mctx, 16);
+ isc_ht_init(, target->catzs->mctx, 16, ISC_HT_CASE_SENSITIVE);
isc_ht_iter_create(newzone->entries, );
@@ -612,7 +612,7 @@ dns_catz_new_zones(dns_catz_zones_t **ca
isc_refcount_init(_zones->refs, 1);
- isc_ht_init(_zones->zones, mctx, 4);
+ isc_ht_init(_zones->zones, mctx, 4, ISC_HT_CASE_SENSITIVE);
isc_mem_attach(mctx, _zones->mctx);
new_zones->zmm = zmm;
@@ -664,7 +664,7 @@ dns_catz_new_zone(dns_catz_zones_t *catz
dns_name_init(_zone->name, NULL);
dns_name_dup(name, catzs->mctx, _zone->name);
- isc_ht_init(_zone->entries, catzs->mctx, 16);
+ isc_ht_init(_zone->entries, catzs->mctx, 16, ISC_HT_CASE_SENSITIVE);
new_zone->updatetimer = NULL;
result = isc_timer_create(catzs->timermgr, isc_timertype_inactive, NULL,
Index: src/external/mpl/bind/dist/lib/dns/message.c
diff -u src/external/mpl/bind/dist/lib/dns/message.c:1.15 src/external/mpl/bind/dist/lib/dns/message.c:1.16
--- src/external/mpl/bind/dist/lib/dns/message.c:1.15 Wed Jan 25 16:43:30 2023
+++ src/external/mpl/bind/dist/lib/dns/message.c Tue Feb 13 10:21:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: message.c,v 1.15 2023/01/25 21:43:30 christos Exp $ */
+/* $NetBSD: message.c,v 1.16 2024/02/13 15:21:09 christos Exp $ */
/*
* Copyright (C) Internet Systems
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Mon Jun 26 22:03:01 UTC 2023 Modified Files: src/external/mpl/bind/dist: configure src/external/mpl/bind/dist/bin/dig: dighost.c src/external/mpl/bind/dist/bin/named: controlconf.c logconf.c main.c server.c zoneconf.c src/external/mpl/bind/dist/bin/nsupdate: nsupdate.c src/external/mpl/bind/dist/bin/rndc: rndc.c src/external/mpl/bind/dist/bin/tests/optional: ratelimiter_test.c rbt_test.c shutdown_test.c sock_test.c task_test.c timer_test.c src/external/mpl/bind/dist/bin/tests/system: feature-test.c src/external/mpl/bind/dist/fuzz: fuzz.h src/external/mpl/bind/dist/lib/dns: catz.c dnsrps.c hmac_link.c keymgr.c keytable.c master.c nsec3.c nta.c rbt.c rbtdb.c request.c resolver.c rpz.c validator.c view.c xfrin.c zone.c src/external/mpl/bind/dist/lib/dns/include/dns: view.h zt.h src/external/mpl/bind/dist/lib/irs: getaddrinfo.c resconf.c src/external/mpl/bind/dist/lib/isc: iterated_hash.c lib.c log.c mem.c ratelimiter.c task.c timer.c src/external/mpl/bind/dist/lib/isc/include/isc: task.h timer.h src/external/mpl/bind/dist/lib/isc/netmgr: netmgr.c src/external/mpl/bind/dist/lib/isc/tests: task_test.c timer_test.c src/external/mpl/bind/dist/lib/ns: query.c src/external/mpl/bind/lib/libisc: Makefile Removed Files: src/external/mpl/bind/dist: tsan-suppressions.txt src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1: controls.conf.in named.dirconf named.iso8601 named.iso8601-utc named.pipeconf named.plain named.plainconf named.symconf named.tsconf named.unlimited named.versconf rndc.conf.in root.db src/external/mpl/bind/dist/bin/tests/system/ttl: tests.sh src/external/mpl/bind/dist/doc/man: named-compilezone.1in Log Message: merge conflicts between 9.16.37 and 9.16.42 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/mpl/bind/dist/configure cvs rdiff -u -r1.1.1.1 -r0 src/external/mpl/bind/dist/tsan-suppressions.txt cvs rdiff -u -r1.14 -r1.15 src/external/mpl/bind/dist/bin/dig/dighost.c cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/bin/named/controlconf.c cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/bin/named/logconf.c cvs rdiff -u -r1.14 -r1.15 src/external/mpl/bind/dist/bin/named/main.c cvs rdiff -u -r1.19 -r1.20 src/external/mpl/bind/dist/bin/named/server.c cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/bin/named/zoneconf.c cvs rdiff -u -r1.12 -r1.13 src/external/mpl/bind/dist/bin/nsupdate/nsupdate.c cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/bin/rndc/rndc.c cvs rdiff -u -r1.6 -r1.7 \ src/external/mpl/bind/dist/bin/tests/optional/ratelimiter_test.c \ src/external/mpl/bind/dist/bin/tests/optional/sock_test.c \ src/external/mpl/bind/dist/bin/tests/optional/task_test.c cvs rdiff -u -r1.7 -r1.8 \ src/external/mpl/bind/dist/bin/tests/optional/rbt_test.c \ src/external/mpl/bind/dist/bin/tests/optional/shutdown_test.c \ src/external/mpl/bind/dist/bin/tests/optional/timer_test.c cvs rdiff -u -r1.10 -r1.11 \ src/external/mpl/bind/dist/bin/tests/system/feature-test.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/controls.conf.in \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/rndc.conf.in \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/root.db cvs rdiff -u -r1.1.1.3 -r0 \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.dirconf \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601 \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601-utc \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.pipeconf \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plain \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plainconf \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.symconf \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.tsconf \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.unlimited \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.versconf cvs rdiff -u -r1.1.1.3 -r0 \ src/external/mpl/bind/dist/bin/tests/system/ttl/tests.sh cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/doc/man/named-compilezone.1in cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/fuzz/fuzz.h cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/dns/catz.c \ src/external/mpl/bind/dist/lib/dns/dnsrps.c \ src/external/mpl/bind/dist/lib/dns/keymgr.c cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/lib/dns/hmac_link.c \ src/external/mpl/bind/dist/lib/dns/request.c cvs
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Mon Jun 26 22:03:01 UTC 2023 Modified Files: src/external/mpl/bind/dist: configure src/external/mpl/bind/dist/bin/dig: dighost.c src/external/mpl/bind/dist/bin/named: controlconf.c logconf.c main.c server.c zoneconf.c src/external/mpl/bind/dist/bin/nsupdate: nsupdate.c src/external/mpl/bind/dist/bin/rndc: rndc.c src/external/mpl/bind/dist/bin/tests/optional: ratelimiter_test.c rbt_test.c shutdown_test.c sock_test.c task_test.c timer_test.c src/external/mpl/bind/dist/bin/tests/system: feature-test.c src/external/mpl/bind/dist/fuzz: fuzz.h src/external/mpl/bind/dist/lib/dns: catz.c dnsrps.c hmac_link.c keymgr.c keytable.c master.c nsec3.c nta.c rbt.c rbtdb.c request.c resolver.c rpz.c validator.c view.c xfrin.c zone.c src/external/mpl/bind/dist/lib/dns/include/dns: view.h zt.h src/external/mpl/bind/dist/lib/irs: getaddrinfo.c resconf.c src/external/mpl/bind/dist/lib/isc: iterated_hash.c lib.c log.c mem.c ratelimiter.c task.c timer.c src/external/mpl/bind/dist/lib/isc/include/isc: task.h timer.h src/external/mpl/bind/dist/lib/isc/netmgr: netmgr.c src/external/mpl/bind/dist/lib/isc/tests: task_test.c timer_test.c src/external/mpl/bind/dist/lib/ns: query.c src/external/mpl/bind/lib/libisc: Makefile Removed Files: src/external/mpl/bind/dist: tsan-suppressions.txt src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1: controls.conf.in named.dirconf named.iso8601 named.iso8601-utc named.pipeconf named.plain named.plainconf named.symconf named.tsconf named.unlimited named.versconf rndc.conf.in root.db src/external/mpl/bind/dist/bin/tests/system/ttl: tests.sh src/external/mpl/bind/dist/doc/man: named-compilezone.1in Log Message: merge conflicts between 9.16.37 and 9.16.42 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/mpl/bind/dist/configure cvs rdiff -u -r1.1.1.1 -r0 src/external/mpl/bind/dist/tsan-suppressions.txt cvs rdiff -u -r1.14 -r1.15 src/external/mpl/bind/dist/bin/dig/dighost.c cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/bin/named/controlconf.c cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/bin/named/logconf.c cvs rdiff -u -r1.14 -r1.15 src/external/mpl/bind/dist/bin/named/main.c cvs rdiff -u -r1.19 -r1.20 src/external/mpl/bind/dist/bin/named/server.c cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/bin/named/zoneconf.c cvs rdiff -u -r1.12 -r1.13 src/external/mpl/bind/dist/bin/nsupdate/nsupdate.c cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/bin/rndc/rndc.c cvs rdiff -u -r1.6 -r1.7 \ src/external/mpl/bind/dist/bin/tests/optional/ratelimiter_test.c \ src/external/mpl/bind/dist/bin/tests/optional/sock_test.c \ src/external/mpl/bind/dist/bin/tests/optional/task_test.c cvs rdiff -u -r1.7 -r1.8 \ src/external/mpl/bind/dist/bin/tests/optional/rbt_test.c \ src/external/mpl/bind/dist/bin/tests/optional/shutdown_test.c \ src/external/mpl/bind/dist/bin/tests/optional/timer_test.c cvs rdiff -u -r1.10 -r1.11 \ src/external/mpl/bind/dist/bin/tests/system/feature-test.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/controls.conf.in \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/rndc.conf.in \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/root.db cvs rdiff -u -r1.1.1.3 -r0 \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.dirconf \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601 \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601-utc \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.pipeconf \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plain \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plainconf \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.symconf \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.tsconf \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.unlimited \ src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.versconf cvs rdiff -u -r1.1.1.3 -r0 \ src/external/mpl/bind/dist/bin/tests/system/ttl/tests.sh cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/doc/man/named-compilezone.1in cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/fuzz/fuzz.h cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/dns/catz.c \ src/external/mpl/bind/dist/lib/dns/dnsrps.c \ src/external/mpl/bind/dist/lib/dns/keymgr.c cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/lib/dns/hmac_link.c \ src/external/mpl/bind/dist/lib/dns/request.c cvs
CVS commit: src/external/mpl/bind/lib
Module Name:src
Committed By: christos
Date: Tue May 9 14:08:18 UTC 2023
Modified Files:
src/external/mpl/bind/lib/libdns: Makefile
src/external/mpl/bind/lib/libisc: Makefile
Log Message:
deal with OpenSSL-3.x
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/lib/libdns/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/mpl/bind/lib/libisc/Makefile
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/bind/lib/libdns/Makefile
diff -u src/external/mpl/bind/lib/libdns/Makefile:1.8 src/external/mpl/bind/lib/libdns/Makefile:1.9
--- src/external/mpl/bind/lib/libdns/Makefile:1.8 Sat May 14 07:43:25 2022
+++ src/external/mpl/bind/lib/libdns/Makefile Tue May 9 10:08:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/05/14 11:43:25 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2023/05/09 14:08:18 christos Exp $
LIB=dns
#USE_SHLIBDIR= yes
@@ -58,4 +58,11 @@ SRCS= acl.c adb.c badcache.c byaddr.c ca
tsig.c ttl.c private.c validator.c version.c view.c xfrin.c zone.c \
zonekey.c zoneverify.c zt.c sdlz.c update.c ${DNSSEC_SRCS}
+COPTS.openssl_link.c+= -Wno-error=deprecated-declarations
+COPTS.openssldh_link.c+= -Wno-error=deprecated-declarations
+COPTS.openssldsa_link.c+= -Wno-error=deprecated-declarations
+COPTS.opensslecdsa_link.c+= -Wno-error=deprecated-declarations
+COPTS.openssleddsa_link.c+= -Wno-error=deprecated-declarations
+COPTS.opensslrsa_link.c+= -Wno-error=deprecated-declarations
+
.include
Index: src/external/mpl/bind/lib/libisc/Makefile
diff -u src/external/mpl/bind/lib/libisc/Makefile:1.18 src/external/mpl/bind/lib/libisc/Makefile:1.19
--- src/external/mpl/bind/lib/libisc/Makefile:1.18 Fri Sep 23 08:15:37 2022
+++ src/external/mpl/bind/lib/libisc/Makefile Tue May 9 10:08:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2022/09/23 12:15:37 christos Exp $
+# $NetBSD: Makefile,v 1.19 2023/05/09 14:08:18 christos Exp $
LIB=isc
#USE_SHLIBDIR= yes
@@ -67,4 +67,7 @@ LDADD+=-Wl,-Bdynamic
LDADD+=-lz
DPADD+=${LIBZ}
+COPTS.hmac.c+= -Wno-error=deprecated-declarations
+COPTS.md.c+= -Wno-error=deprecated-declarations
+
.include
CVS commit: src/external/mpl/bind/lib
Module Name:src Committed By: christos Date: Tue May 9 14:08:18 UTC 2023 Modified Files: src/external/mpl/bind/lib/libdns: Makefile src/external/mpl/bind/lib/libisc: Makefile Log Message: deal with OpenSSL-3.x To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/lib/libdns/Makefile cvs rdiff -u -r1.18 -r1.19 src/external/mpl/bind/lib/libisc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Wed Jan 25 21:43:33 UTC 2023 Modified Files: src/external/mpl/bind/dist: config.h.in configure src/external/mpl/bind/dist/bin/check: check-tool.c named-checkconf.c named-checkzone.c src/external/mpl/bind/dist/bin/confgen: ddns-confgen.c src/external/mpl/bind/dist/bin/delv: delv.c src/external/mpl/bind/dist/bin/dig: dig.c dighost.c host.c src/external/mpl/bind/dist/bin/dnssec: dnssec-cds.c dnssec-keyfromlabel.c dnssec-keygen.c dnssec-revoke.c dnssec-settime.c dnssec-signzone.c dnssectool.c src/external/mpl/bind/dist/bin/named: bind9.xsl.h builtin.c config.c controlconf.c main.c server.c statschannel.c tsigconf.c zoneconf.c src/external/mpl/bind/dist/bin/named/unix: os.c src/external/mpl/bind/dist/bin/nsupdate: nsupdate.c src/external/mpl/bind/dist/bin/pkcs11: pkcs11-keygen.c src/external/mpl/bind/dist/bin/plugins: filter-.c src/external/mpl/bind/dist/bin/rndc: rndc.c src/external/mpl/bind/dist/bin/tests: cfg_test.c wire_test.c src/external/mpl/bind/dist/bin/tests/optional: byaddr_test.c db_test.c name_test.c nsecify.c rbt_test.c zone_test.c src/external/mpl/bind/dist/bin/tests/system: feature-test.c resolve.c src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c src/external/mpl/bind/dist/bin/tests/system/dyndb/driver: db.c src/external/mpl/bind/dist/bin/tests/system/rpz: dnsrps.c src/external/mpl/bind/dist/bin/tests/system/rsabigexponent: bigkey.c src/external/mpl/bind/dist/bin/tools: mdig.c src/external/mpl/bind/dist/contrib/dlz/bin/dlzbdb: dlzbdb.c src/external/mpl/bind/dist/contrib/dlz/drivers: dlz_bdb_driver.c dlz_bdbhpt_driver.c dlz_filesystem_driver.c dlz_odbc_driver.c dlz_postgres_driver.c src/external/mpl/bind/dist/contrib/dlz/modules/bdbhpt: dlz_bdbhpt_dynamic.c src/external/mpl/bind/dist/contrib/dlz/modules/filesystem: dlz_filesystem_dynamic.c src/external/mpl/bind/dist/contrib/dlz/modules/include: dlz_list.h src/external/mpl/bind/dist/contrib/dlz/modules/ldap: dlz_ldap_dynamic.c src/external/mpl/bind/dist/contrib/dlz/modules/mysqldyn: dlz_mysqldyn_mod.c src/external/mpl/bind/dist/contrib/dlz/modules/perl: dlz_perl_driver.c src/external/mpl/bind/dist/contrib/dlz/modules/sqlite3: dlz_sqlite3_dynamic.c src/external/mpl/bind/dist/contrib/dlz/modules/wildcard: dlz_wildcard_dynamic.c src/external/mpl/bind/dist/lib/bind9: check.c getaddresses.c src/external/mpl/bind/dist/lib/dns: adb.c badcache.c byaddr.c cache.c catz.c client.c compress.c db.c diff.c dispatch.c dnsrps.c dnssec.c dst_api.c dst_parse.c ecdb.c ecs.c forward.c gen.c hmac_link.c journal.c key.c keymgr.c master.c masterdump.c message.c name.c ncache.c nsec.c nsec3.c openssl_link.c openssldh_link.c opensslecdsa_link.c openssleddsa_link.c opensslrsa_link.c order.c peer.c pkcs11rsa_link.c private.c rbt.c rbtdb.c rcode.c rdata.c rdatalist.c rdataslab.c request.c resolver.c rootns.c rpz.c rriterator.c rrl.c sdb.c sdlz.c ssu.c stats.c tkey.c tsig.c update.c validator.c view.c xfrin.c zone.c zonekey.c zoneverify.c zt.c src/external/mpl/bind/dist/lib/dns/include/dns: db.h rdataset.h rdatasetiter.h zone.h zt.h src/external/mpl/bind/dist/lib/dns/rdata/any_255: tsig_250.c src/external/mpl/bind/dist/lib/dns/rdata/generic: amtrelay_260.c caa_257.c isdn_20.c key_25.c loc_29.c tkey_249.c txt_16.c src/external/mpl/bind/dist/lib/dns/rdata/in_1: a_1.c _28.c svcb_64.c src/external/mpl/bind/dist/lib/dns/tests: dbversion_test.c dnstest.c rdata_test.c rsa_test.c zt_test.c src/external/mpl/bind/dist/lib/irs: getaddrinfo.c getnameinfo.c src/external/mpl/bind/dist/lib/irs/win32: resconf.c src/external/mpl/bind/dist/lib/isc: app.c buffer.c heap.c ht.c httpd.c lex.c log.c mem.c netaddr.c pk11.c radix.c rwlock.c siphash.c string.c task.c timer.c url.c utf8.c src/external/mpl/bind/dist/lib/isc/include/isc: buffer.h list.h magic.h string.h src/external/mpl/bind/dist/lib/isc/netmgr: netmgr.c tcp.c tcpdns.c udp.c src/external/mpl/bind/dist/lib/isc/tests: random_test.c regex_test.c socket_test.c task_test.c src/external/mpl/bind/dist/lib/isc/unix: file.c socket.c src/external/mpl/bind/dist/lib/isc/win32: dir.c file.c fsaccess.c interfaceiter.c net.c ntgroups.c socket.c src/external/mpl/bind/dist/lib/isc/win32/include/isc: net.h
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Fri Sep 23 12:15:38 UTC 2022 Modified Files: src/external/mpl/bind/dist: Makefile.in bind.keys.h config.h.in configure src/external/mpl/bind/dist/bin/check: check-tool.c check-tool.h named-checkconf.c named-checkzone.c src/external/mpl/bind/dist/bin/confgen: ddns-confgen.c keygen.c keygen.h rndc-confgen.c util.c util.h src/external/mpl/bind/dist/bin/confgen/include/confgen: os.h src/external/mpl/bind/dist/bin/confgen/unix: os.c src/external/mpl/bind/dist/bin/confgen/win32: os.c src/external/mpl/bind/dist/bin/delv: delv.c src/external/mpl/bind/dist/bin/dig: dig.c dighost.c host.c nslookup.c src/external/mpl/bind/dist/bin/dig/include/dig: dig.h src/external/mpl/bind/dist/bin/dnssec: dnssec-cds.c dnssec-dsfromkey.c dnssec-importkey.c dnssec-keyfromlabel.c dnssec-keygen.c dnssec-revoke.c dnssec-settime.c dnssec-signzone.c dnssec-verify.c dnssectool.c dnssectool.h src/external/mpl/bind/dist/bin/named: bind9.xsl.h builtin.c config.c control.c controlconf.c fuzz.c geoip.c log.c logconf.c main.c server.c statschannel.c tkeyconf.c tsigconf.c zoneconf.c src/external/mpl/bind/dist/bin/named/include/dlz: dlz_dlopen_driver.h src/external/mpl/bind/dist/bin/named/include/named: builtin.h config.h control.h fuzz.h geoip.h globals.h log.h logconf.h main.h server.h smf_globals.h statschannel.h tkeyconf.h tsigconf.h types.h zoneconf.h src/external/mpl/bind/dist/bin/named/unix: dlz_dlopen_driver.c os.c src/external/mpl/bind/dist/bin/named/unix/include/named: os.h src/external/mpl/bind/dist/bin/named/win32: dlz_dlopen_driver.c ntservice.c os.c src/external/mpl/bind/dist/bin/named/win32/include/named: ntservice.h os.h src/external/mpl/bind/dist/bin/nsupdate: nsupdate.c src/external/mpl/bind/dist/bin/pkcs11: pkcs11-destroy.c pkcs11-keygen.c pkcs11-list.c pkcs11-tokens.c src/external/mpl/bind/dist/bin/plugins: filter-.c src/external/mpl/bind/dist/bin/rndc: rndc.c util.c util.h src/external/mpl/bind/dist/bin/rndc/include/rndc: os.h src/external/mpl/bind/dist/bin/tests: cfg_test.c makejournal.c wire_test.c src/external/mpl/bind/dist/bin/tests/optional: adb_test.c backtrace_test.c byaddr_test.c byname_test.c db_test.c fsaccess_test.c gsstest.c inter_test.c lex_test.c lfsr_test.c log_test.c master_test.c mempool_test.c name_test.c nsecify.c ratelimiter_test.c rbt_test.c rwlock_test.c serial_test.c shutdown_test.c sig0_test.c sock_test.c sym_test.c task_test.c timer_test.c zone_test.c src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: create.c find.c genrsa.c login.c privrsa.c pubrsa.c session.c sha1.c sign.c verify.c src/external/mpl/bind/dist/bin/tests/system: feature-test.c resolve.c src/external/mpl/bind/dist/bin/tests/system/addzone/ns1: redirect.db.1 redirect.db.2 src/external/mpl/bind/dist/bin/tests/system/addzone/ns2: redirect.db.1 redirect.db.2 src/external/mpl/bind/dist/bin/tests/system/addzone/ns3: redirect.db.1 redirect.db.2 src/external/mpl/bind/dist/bin/tests/system/checkconf: dnssec.1 dnssec.2 dnssec.3 src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c driver.h src/external/mpl/bind/dist/bin/tests/system/dyndb/driver: db.c db.h driver.c instance.c instance.h lock.c lock.h log.c log.h syncptr.c syncptr.h util.h zone.c zone.h src/external/mpl/bind/dist/bin/tests/system/pipelined: pipequeries.c src/external/mpl/bind/dist/bin/tests/system/rndc: gencheck.c src/external/mpl/bind/dist/bin/tests/system/rpz: dnsrps.c src/external/mpl/bind/dist/bin/tests/system/rsabigexponent: bigkey.c src/external/mpl/bind/dist/bin/tests/system/tkey: keycreate.c keydelete.c src/external/mpl/bind/dist/bin/tools: arpaname.c dnstap-read.c mdig.c named-journalprint.c named-nzd2nzf.c named-rrchecker.c nsec3hash.c src/external/mpl/bind/dist/bin/win32/BINDInstall: AccountInfo.h BINDInstall.h BINDInstallDlg.h DirBrowse.h StdAfx.h VersionInfo.h resource.h src/external/mpl/bind/dist/contrib/dlz/bin/dlzbdb: dlzbdb.c src/external/mpl/bind/dist/contrib/dlz/drivers: dlz_bdb_driver.c dlz_bdbhpt_driver.c dlz_drivers.c dlz_filesystem_driver.c dlz_ldap_driver.c dlz_mysql_driver.c dlz_odbc_driver.c dlz_postgres_driver.c dlz_stub_driver.c sdlz_helper.c src/external/mpl/bind/dist/contrib/dlz/drivers/include/dlz:
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Fri Sep 23 12:15:38 UTC 2022 Modified Files: src/external/mpl/bind/dist: Makefile.in bind.keys.h config.h.in configure src/external/mpl/bind/dist/bin/check: check-tool.c check-tool.h named-checkconf.c named-checkzone.c src/external/mpl/bind/dist/bin/confgen: ddns-confgen.c keygen.c keygen.h rndc-confgen.c util.c util.h src/external/mpl/bind/dist/bin/confgen/include/confgen: os.h src/external/mpl/bind/dist/bin/confgen/unix: os.c src/external/mpl/bind/dist/bin/confgen/win32: os.c src/external/mpl/bind/dist/bin/delv: delv.c src/external/mpl/bind/dist/bin/dig: dig.c dighost.c host.c nslookup.c src/external/mpl/bind/dist/bin/dig/include/dig: dig.h src/external/mpl/bind/dist/bin/dnssec: dnssec-cds.c dnssec-dsfromkey.c dnssec-importkey.c dnssec-keyfromlabel.c dnssec-keygen.c dnssec-revoke.c dnssec-settime.c dnssec-signzone.c dnssec-verify.c dnssectool.c dnssectool.h src/external/mpl/bind/dist/bin/named: bind9.xsl.h builtin.c config.c control.c controlconf.c fuzz.c geoip.c log.c logconf.c main.c server.c statschannel.c tkeyconf.c tsigconf.c zoneconf.c src/external/mpl/bind/dist/bin/named/include/dlz: dlz_dlopen_driver.h src/external/mpl/bind/dist/bin/named/include/named: builtin.h config.h control.h fuzz.h geoip.h globals.h log.h logconf.h main.h server.h smf_globals.h statschannel.h tkeyconf.h tsigconf.h types.h zoneconf.h src/external/mpl/bind/dist/bin/named/unix: dlz_dlopen_driver.c os.c src/external/mpl/bind/dist/bin/named/unix/include/named: os.h src/external/mpl/bind/dist/bin/named/win32: dlz_dlopen_driver.c ntservice.c os.c src/external/mpl/bind/dist/bin/named/win32/include/named: ntservice.h os.h src/external/mpl/bind/dist/bin/nsupdate: nsupdate.c src/external/mpl/bind/dist/bin/pkcs11: pkcs11-destroy.c pkcs11-keygen.c pkcs11-list.c pkcs11-tokens.c src/external/mpl/bind/dist/bin/plugins: filter-.c src/external/mpl/bind/dist/bin/rndc: rndc.c util.c util.h src/external/mpl/bind/dist/bin/rndc/include/rndc: os.h src/external/mpl/bind/dist/bin/tests: cfg_test.c makejournal.c wire_test.c src/external/mpl/bind/dist/bin/tests/optional: adb_test.c backtrace_test.c byaddr_test.c byname_test.c db_test.c fsaccess_test.c gsstest.c inter_test.c lex_test.c lfsr_test.c log_test.c master_test.c mempool_test.c name_test.c nsecify.c ratelimiter_test.c rbt_test.c rwlock_test.c serial_test.c shutdown_test.c sig0_test.c sock_test.c sym_test.c task_test.c timer_test.c zone_test.c src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: create.c find.c genrsa.c login.c privrsa.c pubrsa.c session.c sha1.c sign.c verify.c src/external/mpl/bind/dist/bin/tests/system: feature-test.c resolve.c src/external/mpl/bind/dist/bin/tests/system/addzone/ns1: redirect.db.1 redirect.db.2 src/external/mpl/bind/dist/bin/tests/system/addzone/ns2: redirect.db.1 redirect.db.2 src/external/mpl/bind/dist/bin/tests/system/addzone/ns3: redirect.db.1 redirect.db.2 src/external/mpl/bind/dist/bin/tests/system/checkconf: dnssec.1 dnssec.2 dnssec.3 src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c driver.h src/external/mpl/bind/dist/bin/tests/system/dyndb/driver: db.c db.h driver.c instance.c instance.h lock.c lock.h log.c log.h syncptr.c syncptr.h util.h zone.c zone.h src/external/mpl/bind/dist/bin/tests/system/pipelined: pipequeries.c src/external/mpl/bind/dist/bin/tests/system/rndc: gencheck.c src/external/mpl/bind/dist/bin/tests/system/rpz: dnsrps.c src/external/mpl/bind/dist/bin/tests/system/rsabigexponent: bigkey.c src/external/mpl/bind/dist/bin/tests/system/tkey: keycreate.c keydelete.c src/external/mpl/bind/dist/bin/tools: arpaname.c dnstap-read.c mdig.c named-journalprint.c named-nzd2nzf.c named-rrchecker.c nsec3hash.c src/external/mpl/bind/dist/bin/win32/BINDInstall: AccountInfo.h BINDInstall.h BINDInstallDlg.h DirBrowse.h StdAfx.h VersionInfo.h resource.h src/external/mpl/bind/dist/contrib/dlz/bin/dlzbdb: dlzbdb.c src/external/mpl/bind/dist/contrib/dlz/drivers: dlz_bdb_driver.c dlz_bdbhpt_driver.c dlz_drivers.c dlz_filesystem_driver.c dlz_ldap_driver.c dlz_mysql_driver.c dlz_odbc_driver.c dlz_postgres_driver.c dlz_stub_driver.c sdlz_helper.c src/external/mpl/bind/dist/contrib/dlz/drivers/include/dlz:
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Mon Jun 27 16:44:58 UTC 2022
Modified Files:
src/external/mpl/bind/dist/lib/isc: hp.c
Log Message:
downgrade from LOG_ERR to LOG_DEBUG, requested by uwe@
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/lib/isc/hp.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/bind/dist/lib/isc/hp.c
diff -u src/external/mpl/bind/dist/lib/isc/hp.c:1.7 src/external/mpl/bind/dist/lib/isc/hp.c:1.8
--- src/external/mpl/bind/dist/lib/isc/hp.c:1.7 Sun Jan 30 14:49:30 2022
+++ src/external/mpl/bind/dist/lib/isc/hp.c Mon Jun 27 12:44:58 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: hp.c,v 1.7 2022/01/30 19:49:30 christos Exp $ */
+/* $NetBSD: hp.c,v 1.8 2022/06/27 16:44:58 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -87,7 +87,7 @@ tid(void) {
void
isc_hp_init(int max_threads) {
- syslog(LOG_ERR, "setting maxthreads to %d from %d", max_threads,
+ syslog(LOG_DEBUG, "setting maxthreads to %d from %d", max_threads,
isc__hp_max_threads);
isc__hp_max_threads = max_threads;
isc__hp_max_retired = max_threads * HP_MAX_HPS;
@@ -108,7 +108,7 @@ isc_hp_new(isc_mem_t *mctx, size_t max_h
hp->hp = isc_mem_get(mctx, isc__hp_max_threads * sizeof(hp->hp[0]));
hp->rl = isc_mem_get(mctx, isc__hp_max_threads * sizeof(hp->rl[0]));
- syslog(LOG_ERR, "%s: max_hps=%zu max_threads=%d", __func__, max_hps,
+ syslog(LOG_DEBUG, "%s: max_hps=%zu max_threads=%d", __func__, max_hps,
isc__hp_max_threads);
for (int i = 0; i < isc__hp_max_threads; i++) {
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src Committed By: christos Date: Mon Jun 27 16:44:58 UTC 2022 Modified Files: src/external/mpl/bind/dist/lib/isc: hp.c Log Message: downgrade from LOG_ERR to LOG_DEBUG, requested by uwe@ To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/lib/isc/hp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/lib/libdns
Module Name:src Committed By: rillig Date: Sat May 14 11:43:25 UTC 2022 Modified Files: src/external/mpl/bind/lib/libdns: Makefile Log Message: libdns: suppress a few lint warnings that occur too often To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/lib/libdns/Makefile 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/bind/lib/libdns/Makefile diff -u src/external/mpl/bind/lib/libdns/Makefile:1.7 src/external/mpl/bind/lib/libdns/Makefile:1.8 --- src/external/mpl/bind/lib/libdns/Makefile:1.7 Thu Apr 29 17:26:14 2021 +++ src/external/mpl/bind/lib/libdns/Makefile Sat May 14 11:43:25 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2021/04/29 17:26:14 christos Exp $ +# $NetBSD: Makefile,v 1.8 2022/05/14 11:43:25 rillig Exp $ LIB=dns #USE_SHLIBDIR= yes @@ -33,6 +33,16 @@ DNSSEC_SRCS+= gssapi_link.c CWARNFLAGS.clang+= -Wno-error=tautological-constant-compare .endif +# util.h, ISC_REQUIRE +LINTFLAGS+= -X 129 # expression has null effect +# opensslecdsa_link.c, DST_RET does not conform to macro conventions. +LINTFLAGS+= -X 193 # statement not reached +# Most casts are to isc__magic_t and thus look intentional. +LINTFLAGS+= -X 247 # pointer cast from '%s' to '%s' may be troublesome +# 'uint32_tobuffer(token.value.as_ulong' looks obviously wrong but is used in +# a lot of places. +LINTFLAGS+= -X 132 # conversion from '%s' to '%s' may lose accuracy +LINTFLAGS+= -X 298 # conversion from '%s' to '%s' may lose accuracy, arg #%d SRCS= acl.c adb.c badcache.c byaddr.c cache.c callbacks.c catz.c \ clientinfo.c compress.c client.c dyndb.c tsec.c ecdb.c ecs.c \
CVS commit: src/external/mpl/bind/lib/libdns
Module Name:src Committed By: rillig Date: Sat May 14 11:43:25 UTC 2022 Modified Files: src/external/mpl/bind/lib/libdns: Makefile Log Message: libdns: suppress a few lint warnings that occur too often To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/lib/libdns/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src
Committed By: christos
Date: Fri Mar 11 16:24:22 UTC 2022
Modified Files:
src/external/mpl/bind/lib/plugins: Makefile
Log Message:
fix reversed test
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/lib/plugins/Makefile
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/bind/lib/plugins/Makefile
diff -u src/external/mpl/bind/lib/plugins/Makefile:1.3 src/external/mpl/bind/lib/plugins/Makefile:1.4
--- src/external/mpl/bind/lib/plugins/Makefile:1.3 Fri Mar 11 08:39:01 2022
+++ src/external/mpl/bind/lib/plugins/Makefile Fri Mar 11 11:24:22 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/03/11 13:39:01 christos Exp $
+# $NetBSD: Makefile,v 1.4 2022/03/11 16:24:22 christos Exp $
LIBISMODULE:= yes
LIB= filter-
@@ -13,7 +13,7 @@ DIST=${IDIST}/bin/plugins
.PATH: ${DIST}
-.if ${MLIBDIR:Uno} != no && ${MKPIC} != "no"
+.if !defined(MLIBDIR) && ${MKPIC} != "no"
.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
.else
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src Committed By: christos Date: Fri Mar 11 16:24:22 UTC 2022 Modified Files: src/external/mpl/bind/lib/plugins: Makefile Log Message: fix reversed test To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/lib/plugins/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src
Committed By: christos
Date: Fri Mar 11 13:39:01 UTC 2022
Modified Files:
src/external/mpl/bind/lib/plugins: Makefile
Log Message:
Don't try to install compat plugins; they are not useful since we don't
build compat named.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/lib/plugins/Makefile
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/bind/lib/plugins/Makefile
diff -u src/external/mpl/bind/lib/plugins/Makefile:1.2 src/external/mpl/bind/lib/plugins/Makefile:1.3
--- src/external/mpl/bind/lib/plugins/Makefile:1.2 Mon Mar 7 02:53:08 2022
+++ src/external/mpl/bind/lib/plugins/Makefile Fri Mar 11 08:39:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/03/07 07:53:08 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2022/03/11 13:39:01 christos Exp $
LIBISMODULE:= yes
LIB= filter-
@@ -13,7 +13,7 @@ DIST=${IDIST}/bin/plugins
.PATH: ${DIST}
-.if ${MKPIC} != "no"
+.if ${MLIBDIR:Uno} != no && ${MKPIC} != "no"
.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
.else
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src Committed By: christos Date: Fri Mar 11 13:39:01 UTC 2022 Modified Files: src/external/mpl/bind/lib/plugins: Makefile Log Message: Don't try to install compat plugins; they are not useful since we don't build compat named. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/lib/plugins/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src Committed By: mrg Date: Mon Mar 7 07:53:08 UTC 2022 Modified Files: src/external/mpl/bind/lib/plugins: Makefile Log Message: fix build when the tree hasn't been built already. LIB wasn't defined by the time Makefile.inc is included, and the wrong thing happens. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/lib/plugins/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src Committed By: mrg Date: Mon Mar 7 07:53:08 UTC 2022 Modified Files: src/external/mpl/bind/lib/plugins: Makefile Log Message: fix build when the tree hasn't been built already. LIB wasn't defined by the time Makefile.inc is included, and the wrong thing happens. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/lib/plugins/Makefile 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/bind/lib/plugins/Makefile diff -u src/external/mpl/bind/lib/plugins/Makefile:1.1 src/external/mpl/bind/lib/plugins/Makefile:1.2 --- src/external/mpl/bind/lib/plugins/Makefile:1.1 Sun Mar 6 17:50:19 2022 +++ src/external/mpl/bind/lib/plugins/Makefile Mon Mar 7 07:53:08 2022 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2022/03/06 17:50:19 christos Exp $ +# $NetBSD: Makefile,v 1.2 2022/03/07 07:53:08 mrg Exp $ LIBISMODULE:= yes +LIB= filter- + .include SHLIB_MAJOR=0 -LIB= filter- SRCS= filter-.c LIBDIR= /usr/lib/named
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src
Committed By: christos
Date: Sun Mar 6 17:50:19 UTC 2022
Added Files:
src/external/mpl/bind/lib/plugins: Makefile
Log Message:
Makefile for plugins
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/lib/plugins/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mpl/bind/lib/plugins/Makefile
diff -u /dev/null src/external/mpl/bind/lib/plugins/Makefile:1.1
--- /dev/null Sun Mar 6 12:50:19 2022
+++ src/external/mpl/bind/lib/plugins/Makefile Sun Mar 6 12:50:19 2022
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1 2022/03/06 17:50:19 christos Exp $
+
+LIBISMODULE:= yes
+.include
+
+SHLIB_MAJOR=0
+LIB= filter-
+SRCS= filter-.c
+LIBDIR= /usr/lib/named
+
+DIST=${IDIST}/bin/plugins
+
+.PATH: ${DIST}
+
+.if ${MKPIC} != "no"
+.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
+libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
+.else
+libinstall::
+.endif
+
+.include
+
+${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}: ${LIB}.so.${SHLIB_FULLVERSION}
+ ${_MKTARGET_INSTALL}
+ ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${.ALLSRC} ${.TARGET}
CVS commit: src/external/mpl/bind/lib/plugins
Module Name:src Committed By: christos Date: Sun Mar 6 17:50:19 UTC 2022 Added Files: src/external/mpl/bind/lib/plugins: Makefile Log Message: Makefile for plugins To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/lib/plugins/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Sun Jan 30 19:49:30 UTC 2022
Modified Files:
src/external/mpl/bind/dist/lib/isc: hp.c
Log Message:
Add some more debugging to collect information about the sequence of events.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/isc/hp.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/bind/dist/lib/isc/hp.c
diff -u src/external/mpl/bind/dist/lib/isc/hp.c:1.6 src/external/mpl/bind/dist/lib/isc/hp.c:1.7
--- src/external/mpl/bind/dist/lib/isc/hp.c:1.6 Sun Jan 30 13:54:52 2022
+++ src/external/mpl/bind/dist/lib/isc/hp.c Sun Jan 30 14:49:30 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: hp.c,v 1.6 2022/01/30 18:54:52 christos Exp $ */
+/* $NetBSD: hp.c,v 1.7 2022/01/30 19:49:30 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -108,6 +108,9 @@ isc_hp_new(isc_mem_t *mctx, size_t max_h
hp->hp = isc_mem_get(mctx, isc__hp_max_threads * sizeof(hp->hp[0]));
hp->rl = isc_mem_get(mctx, isc__hp_max_threads * sizeof(hp->rl[0]));
+ syslog(LOG_ERR, "%s: max_hps=%zu max_threads=%d", __func__, max_hps,
+ isc__hp_max_threads);
+
for (int i = 0; i < isc__hp_max_threads; i++) {
hp->hp[i] = isc_mem_get(mctx, CLPAD * 2 * sizeof(hp->hp[i][0]));
hp->rl[i] = isc_mem_get(mctx, sizeof(*hp->rl[0]));
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src Committed By: christos Date: Sun Jan 30 19:49:30 UTC 2022 Modified Files: src/external/mpl/bind/dist/lib/isc: hp.c Log Message: Add some more debugging to collect information about the sequence of events. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/isc/hp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Sun Jan 30 18:54:52 UTC 2022
Modified Files:
src/external/mpl/bind/dist/lib/isc: hp.c
Log Message:
a bit less verbose
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isc/hp.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/bind/dist/lib/isc/hp.c
diff -u src/external/mpl/bind/dist/lib/isc/hp.c:1.5 src/external/mpl/bind/dist/lib/isc/hp.c:1.6
--- src/external/mpl/bind/dist/lib/isc/hp.c:1.5 Sun Jan 30 08:11:46 2022
+++ src/external/mpl/bind/dist/lib/isc/hp.c Sun Jan 30 13:54:52 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: hp.c,v 1.5 2022/01/30 13:11:46 christos Exp $ */
+/* $NetBSD: hp.c,v 1.6 2022/01/30 18:54:52 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -87,7 +87,7 @@ tid(void) {
void
isc_hp_init(int max_threads) {
- syslog(LOG_ERR|LOG_CONS, "setting maxthreads to %d from %d", max_threads,
+ syslog(LOG_ERR, "setting maxthreads to %d from %d", max_threads,
isc__hp_max_threads);
isc__hp_max_threads = max_threads;
isc__hp_max_retired = max_threads * HP_MAX_HPS;
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src Committed By: christos Date: Sun Jan 30 18:54:52 UTC 2022 Modified Files: src/external/mpl/bind/dist/lib/isc: hp.c Log Message: a bit less verbose To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isc/hp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Sun Jan 30 13:11:46 UTC 2022
Modified Files:
src/external/mpl/bind/dist/lib/isc: hp.c
Log Message:
Avoid retiring a thread with a xtid >= isc__hp_max_threads and crashing.
XXX: need to fix the real bug, but this will do for now.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/hp.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/bind/dist/lib/isc/hp.c
diff -u src/external/mpl/bind/dist/lib/isc/hp.c:1.4 src/external/mpl/bind/dist/lib/isc/hp.c:1.5
--- src/external/mpl/bind/dist/lib/isc/hp.c:1.4 Thu Apr 29 13:26:12 2021
+++ src/external/mpl/bind/dist/lib/isc/hp.c Sun Jan 30 08:11:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: hp.c,v 1.4 2021/04/29 17:26:12 christos Exp $ */
+/* $NetBSD: hp.c,v 1.5 2022/01/30 13:11:46 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -55,6 +55,9 @@
#include
#include
+#include
+#include
+
#define HP_MAX_THREADS 128
static int isc__hp_max_threads = HP_MAX_THREADS;
#define HP_MAX_HPS 4 /* This is named 'K' in the HP paper */
@@ -84,6 +87,8 @@ tid(void) {
void
isc_hp_init(int max_threads) {
+ syslog(LOG_ERR|LOG_CONS, "setting maxthreads to %d from %d", max_threads,
+ isc__hp_max_threads);
isc__hp_max_threads = max_threads;
isc__hp_max_retired = max_threads * HP_MAX_HPS;
}
@@ -175,15 +180,25 @@ isc_hp_protect_release(isc_hp_t *hp, int
void
isc_hp_retire(isc_hp_t *hp, uintptr_t ptr) {
- hp->rl[tid()]->list[hp->rl[tid()]->size++] = ptr;
- INSIST(hp->rl[tid()]->size < isc__hp_max_retired);
+ int xtid = tid();
+ if (xtid < 0 || xtid >= isc__hp_max_threads) {
+ syslog(LOG_ERR, "bad thread id %d >= %d", xtid,
+ isc__hp_max_threads);
+ return;
+ }
+ if (hp->rl[xtid] == NULL) {
+ syslog(LOG_ERR, "null rl for thread id %d", xtid);
+ abort();
+ }
+ hp->rl[xtid]->list[hp->rl[xtid]->size++] = ptr;
+ INSIST(hp->rl[xtid]->size < isc__hp_max_retired);
- if (hp->rl[tid()]->size < HP_THRESHOLD_R) {
+ if (hp->rl[xtid]->size < HP_THRESHOLD_R) {
return;
}
- for (int iret = 0; iret < hp->rl[tid()]->size; iret++) {
- uintptr_t obj = hp->rl[tid()]->list[iret];
+ for (int iret = 0; iret < hp->rl[xtid]->size; iret++) {
+ uintptr_t obj = hp->rl[xtid]->list[iret];
bool can_delete = true;
for (int itid = 0; itid < isc__hp_max_threads && can_delete;
itid++) {
@@ -196,11 +211,11 @@ isc_hp_retire(isc_hp_t *hp, uintptr_t pt
}
if (can_delete) {
- size_t bytes = (hp->rl[tid()]->size - iret) *
- sizeof(hp->rl[tid()]->list[0]);
- memmove(>rl[tid()]->list[iret],
->rl[tid()]->list[iret + 1], bytes);
- hp->rl[tid()]->size--;
+ size_t bytes = (hp->rl[xtid]->size - iret) *
+ sizeof(hp->rl[xtid]->list[0]);
+ memmove(>rl[xtid]->list[iret],
+>rl[xtid]->list[iret + 1], bytes);
+ hp->rl[xtid]->size--;
hp->deletefunc((void *)obj);
}
}
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src Committed By: christos Date: Sun Jan 30 13:11:46 UTC 2022 Modified Files: src/external/mpl/bind/dist/lib/isc: hp.c Log Message: Avoid retiring a thread with a xtid >= isc__hp_max_threads and crashing. XXX: need to fix the real bug, but this will do for now. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/hp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/dns
Module Name:src Committed By: christos Date: Fri Aug 20 13:20:28 UTC 2021 Modified Files: src/external/mpl/bind/dist/lib/dns: mapapi Log Message: bump the map api To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/external/mpl/bind/dist/lib/dns/mapapi 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/bind/dist/lib/dns/mapapi diff -u src/external/mpl/bind/dist/lib/dns/mapapi:1.1.1.3 src/external/mpl/bind/dist/lib/dns/mapapi:1.2 --- src/external/mpl/bind/dist/lib/dns/mapapi:1.1.1.3 Sun May 24 15:36:41 2020 +++ src/external/mpl/bind/dist/lib/dns/mapapi Fri Aug 20 09:20:28 2021 @@ -13,4 +13,4 @@ # Whenever releasing a new major release of BIND9, set this value # back to 1.0 when releasing the first alpha. Map files are *never* # compatible across major releases. -MAPAPI=2.0 +MAPAPI=3.0
CVS commit: src/external/mpl/bind/dist/lib/dns
Module Name:src Committed By: christos Date: Fri Aug 20 13:20:28 UTC 2021 Modified Files: src/external/mpl/bind/dist/lib/dns: mapapi Log Message: bump the map api To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/external/mpl/bind/dist/lib/dns/mapapi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Thu Aug 19 11:50:22 UTC 2021 Modified Files: src/external/mpl/bind: Makefile.inc src/external/mpl/bind/dist: Makefile.in config.h.in configure src/external/mpl/bind/dist/bin/delv: delv.c src/external/mpl/bind/dist/bin/dig: dighost.c host.c src/external/mpl/bind/dist/bin/dnssec: dnssec-signzone.c dnssectool.c src/external/mpl/bind/dist/bin/named: config.c controlconf.c main.c server.c zoneconf.c src/external/mpl/bind/dist/bin/named/include/named: config.h src/external/mpl/bind/dist/bin/named/unix: os.c src/external/mpl/bind/dist/bin/nsupdate: nsupdate.c src/external/mpl/bind/dist/bin/rndc: rndc.c src/external/mpl/bind/dist/bin/tests/optional: adb_test.c byaddr_test.c byname_test.c gsstest.c ratelimiter_test.c shutdown_test.c sig0_test.c sock_test.c task_test.c timer_test.c zone_test.c src/external/mpl/bind/dist/bin/tests/system: resolve.c src/external/mpl/bind/dist/bin/tests/system/dyndb/driver: driver.c src/external/mpl/bind/dist/bin/tests/system/pipelined: pipequeries.c src/external/mpl/bind/dist/bin/tests/system/tkey: keycreate.c keydelete.c src/external/mpl/bind/dist/bin/tools: mdig.c named-journalprint.c src/external/mpl/bind/dist/lib/bind9: check.c src/external/mpl/bind/dist/lib/dns: cache.c client.c dnssec.c dst_api.c dst_internal.h dst_parse.c dyndb.c journal.c keymgr.c masterdump.c message.c name.c nsec3.c openssl_link.c rbt.c rbtdb.c rcode.c rdata.c resolver.c tkey.c tsig.c update.c validator.c xfrin.c zone.c zoneverify.c src/external/mpl/bind/dist/lib/dns/include/dns: client.h db.h diff.h dyndb.h events.h keymgr.h masterdump.h message.h name.h nsec3.h rdata.h rdataset.h rpz.h zone.h src/external/mpl/bind/dist/lib/dns/include/dst: dst.h src/external/mpl/bind/dist/lib/dns/rdata/generic: avc_258.c cdnskey_60.c cds_59.c dlv_32769.c dnskey_48.c ds_43.c key_25.c keydata_65533.c ninfo_56.c rkey_57.c smimea_53.c spf_99.c ta_32768.c tlsa_52.c txt_16.c x25_19.c zonemd_63.c zonemd_63.h src/external/mpl/bind/dist/lib/dns/rdata/in_1: atma_34.c src/external/mpl/bind/dist/lib/dns/tests: db_test.c dnstest.c nsec3_test.c rbtdb_test.c rdata_test.c update_test.c src/external/mpl/bind/dist/lib/irs: context.c getnameinfo.c src/external/mpl/bind/dist/lib/isc: app.c lib.c managers.c mem.c netmgr_p.h result.c rwlock.c stats.c task.c task_p.h taskpool.c timer.c tls.c tm.c trampoline_p.h url.c src/external/mpl/bind/dist/lib/isc/include/isc: app.h barrier.h managers.h mem.h netmgr.h result.h socket.h task.h taskpool.h timer.h types.h url.h util.h src/external/mpl/bind/dist/lib/isc/netmgr: netmgr-int.h netmgr.c tcp.c tcpdns.c udp.c uv-compat.c uv-compat.h uverr2result.c src/external/mpl/bind/dist/lib/isc/tests: isctest.c netmgr_test.c quota_test.c task_test.c taskpool_test.c timer_test.c uv_wrap.h src/external/mpl/bind/dist/lib/isc/unix: dir.c socket.c src/external/mpl/bind/dist/lib/isc/unix/include/isc: stdatomic.h src/external/mpl/bind/dist/lib/isc/win32: DLLMain.c dir.c file.c socket.c time.c src/external/mpl/bind/dist/lib/isc/win32/include/isc: time.h src/external/mpl/bind/dist/lib/isccfg: kaspconf.c namedconf.c src/external/mpl/bind/dist/lib/ns: client.c interfacemgr.c query.c update.c xfrout.c src/external/mpl/bind/dist/lib/ns/include/ns: query.h src/external/mpl/bind/dist/lib/ns/tests: nstest.c src/external/mpl/bind/include: config.h src/external/mpl/bind/include/dns: rdatastruct.h src/external/mpl/bind/include/irs: netdb.h src/external/mpl/bind/include/isc: stdatomic.h src/external/mpl/bind/lib/libbind9: shlib_version src/external/mpl/bind/lib/libdns: shlib_version src/external/mpl/bind/lib/libirs: shlib_version src/external/mpl/bind/lib/libisc: Makefile shlib_version src/external/mpl/bind/lib/libisccc: shlib_version src/external/mpl/bind/lib/libisccfg: shlib_version src/external/mpl/bind/lib/libns: shlib_version Removed Files: src/external/mpl/bind/dist/bin/tests/system/checkconf: bad-kasp1.conf bad-kasp5.conf src/external/mpl/bind/dist/bin/tests/system/checkds: dig.bat dig.pl dig.sh missing.example.dnskey.db missing.example.ds.db none.example.dnskey.db none.example.ds.db ok.example.dnskey.db ok.example.ds.db prep.example.db prep.example.ds.db tests.sh wrong.example.dnskey.db wrong.example.ds.db
re: CVS commit: src/external/mpl/bind/dist
> I think this is a misunderstanding. indeed. sorry for the noise and mis-request. .mrg.
Re: CVS commit: src/external/mpl/bind/dist
06.04.2021 20:55:54 matthew green : >> Module Name: src >> Committed By: rillig >> Date: Mon Apr 5 11:27:04 UTC 2021 >> >> Modified Files: >> src/external/mpl/bind/dist/bin/check: check-tool.c named-checkconf.c >> named-checkzone.c > [ ... ] >> src/external/mpl/bind/dist/lib/ns/tests: nstest.h >> >> Log Message: >> bind: remove unnecessary CONSTCOND comments >> >> Since lint1/tree.c 1.202 from 2021-01-31, lint no longer needs the >> /*CONSTCOND*/ for do-while-0 "loops". >> >> No functional change. > > please do not make such changes to upstream code. it should > be obvious why.. > > please revert this and all following changes. I think this is a misunderstanding. My recent commits made our local copy as similar to the upstream code as possible. Before my changes, our copy differed because we had inserted the /*CONSTCOND*/ comments, plus a few workarounds for bugs in lint. Since these bugs have been fixed a few days ago, we no longer need these comments and workarounds, therefore I removed them. When I wrote the commit message, I didn't mention these details since in that very moment they were obvious to me. In that moment I didn't think about this possible misunderstanding. Roland
Re: CVS commit: src/external/mpl/bind/dist
In article <9374.1617735...@splode.eterna.com.au>, matthew green wrote: >> Module Name: src >> Committed By:rillig >> Date:Mon Apr 5 11:27:04 UTC 2021 >> >> Modified Files: >> src/external/mpl/bind/dist/bin/check: check-tool.c named-checkconf.c >> named-checkzone.c >[ ... ] >> src/external/mpl/bind/dist/lib/ns/tests: nstest.h >> >> Log Message: >> bind: remove unnecessary CONSTCOND comments >> >> Since lint1/tree.c 1.202 from 2021-01-31, lint no longer needs the >> /*CONSTCOND*/ for do-while-0 "loops". >> >> No functional change. > >please do not make such changes to upstream code. it should >be obvious why.. > >please revert this and all following changes. This is reversion of our local changes to match upstream. So those patches actually do what you are asking :-) christos
re: CVS commit: src/external/mpl/bind/dist
> Module Name: src > Committed By: rillig > Date: Mon Apr 5 11:27:04 UTC 2021 > > Modified Files: > src/external/mpl/bind/dist/bin/check: check-tool.c named-checkconf.c > named-checkzone.c [ ... ] > src/external/mpl/bind/dist/lib/ns/tests: nstest.h > > Log Message: > bind: remove unnecessary CONSTCOND comments > > Since lint1/tree.c 1.202 from 2021-01-31, lint no longer needs the > /*CONSTCOND*/ for do-while-0 "loops". > > No functional change. please do not make such changes to upstream code. it should be obvious why.. please revert this and all following changes. .mrg.
CVS commit: src/external/mpl/bind/dist/lib/isc/include/isc
Module Name:src Committed By: christos Date: Thu Nov 28 00:18:36 UTC 2019 Modified Files: src/external/mpl/bind/dist/lib/isc/include/isc: types.h Log Message: match ifdefs with stats.c atomic selection To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/mpl/bind/dist/lib/isc/include/isc/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/isc/include/isc
Module Name:src
Committed By: christos
Date: Thu Nov 28 00:18:36 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc/include/isc: types.h
Log Message:
match ifdefs with stats.c atomic selection
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mpl/bind/dist/lib/isc/include/isc/types.h
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/bind/dist/lib/isc/include/isc/types.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/types.h:1.5 src/external/mpl/bind/dist/lib/isc/include/isc/types.h:1.6
--- src/external/mpl/bind/dist/lib/isc/include/isc/types.h:1.5 Wed Nov 27 00:48:42 2019
+++ src/external/mpl/bind/dist/lib/isc/include/isc/types.h Wed Nov 27 19:18:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.5 2019/11/27 05:48:42 christos Exp $ */
+/* $NetBSD: types.h,v 1.6 2019/11/28 00:18:36 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -78,7 +78,7 @@ typedef struct isc_socket isc_socket_t;
typedef struct isc_socketevent isc_socketevent_t; /*%< Socket Event */
typedef struct isc_socketmgr isc_socketmgr_t; /*%< Socket Manager */
typedef struct isc_stats isc_stats_t; /*%< Statistics */
-#if defined(_WIN32) && !defined(_WIN64)
+#if defined(_WIN32) && !defined(_WIN64) || !defined(_LP64)
typedef int_fast32_t isc_statscounter_t; /*%< Statistics Counter */
#else
typedef int_fast64_t isc_statscounter_t;
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Wed Nov 27 05:48:43 UTC 2019 Modified Files: src/external/mpl/bind: bind2netbsd src/external/mpl/bind/dist: configure src/external/mpl/bind/dist/bin/check: check-tool.c src/external/mpl/bind/dist/bin/delv: delv.c src/external/mpl/bind/dist/bin/dig: dighost.c host.c nslookup.c src/external/mpl/bind/dist/bin/dnssec: dnssec-dsfromkey.c dnssec-importkey.c dnssec-signzone.c src/external/mpl/bind/dist/bin/named: config.c main.c server.c statschannel.c zoneconf.c src/external/mpl/bind/dist/bin/named/include/named: globals.h src/external/mpl/bind/dist/bin/named/win32: os.c src/external/mpl/bind/dist/bin/nsupdate: nsupdate.c src/external/mpl/bind/dist/bin/tests/optional: zone_test.c src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c src/external/mpl/bind/dist/bin/tests/system/dyndb/driver: syncptr.c src/external/mpl/bind/dist/doc/arm: Bv9ARM.pdf src/external/mpl/bind/dist/lib/bind9: check.c src/external/mpl/bind/dist/lib/dns: acl.c adb.c client.c dnsrps.c ecdb.c geoip2.c gssapi_link.c journal.c lookup.c masterdump.c message.c name.c nsec3.c nta.c openssldh_link.c opensslrsa_link.c order.c rbt.c rbtdb.c rcode.c rdata.c rdatalist.c rdataset.c resolver.c rrl.c sdb.c sdlz.c spnego_asn1.c tkey.c tsig.c ttl.c update.c validator.c view.c zone.c zoneverify.c src/external/mpl/bind/dist/lib/dns/include/dns: acl.h name.h tsig.h src/external/mpl/bind/dist/lib/dns/rdata/any_255: tsig_250.c src/external/mpl/bind/dist/lib/dns/rdata/ch_3: a_1.c src/external/mpl/bind/dist/lib/dns/rdata/generic: afsdb_18.c avc_258.c caa_257.c cds_59.c cert_37.c cname_5.c csync_62.c dlv_32769.c dname_39.c doa_259.c ds_43.c eui48_108.c eui64_109.c gpos_27.c hinfo_13.c hip_55.c ipseckey_45.c isdn_20.c key_25.c keydata_65533.c l32_105.c l64_106.c loc_29.c lp_107.c mb_7.c md_3.c mf_4.c mg_8.c minfo_14.c mr_9.c mx_15.c naptr_35.c nid_104.c ninfo_56.c ns_2.c nsec3_50.c nsec3param_51.c nsec_47.c null_10.c nxt_30.c openpgpkey_61.c opt_41.c proforma.c ptr_12.c rp_17.c rrsig_46.c rt_21.c sig_24.c sink_40.c smimea_53.c soa_6.c spf_99.c sshfp_44.c ta_32768.c talink_58.c tkey_249.c tlsa_52.c txt_16.c uri_256.c x25_19.c src/external/mpl/bind/dist/lib/dns/rdata/hs_4: a_1.c src/external/mpl/bind/dist/lib/dns/rdata/in_1: a6_38.c a_1.c _28.c apl_42.c atma_34.c dhcid_49.c eid_31.c kx_36.c nimloc_32.c nsap-ptr_23.c nsap_22.c px_26.c srv_33.c wks_11.c src/external/mpl/bind/dist/lib/dns/tests: dnstap_test.c dnstest.c master_test.c rbt_serialize_test.c src/external/mpl/bind/dist/lib/isc: buffer.c pk11.c result.c sockaddr.c stats.c task.c src/external/mpl/bind/dist/lib/isc/include/isc: result.h stats.h types.h util.h src/external/mpl/bind/dist/lib/isc/tests: hmac_test.c ht_test.c md_test.c mem_test.c random_test.c src/external/mpl/bind/dist/lib/isc/unix: meminfo.c net.c resource.c socket.c src/external/mpl/bind/dist/lib/isc/win32: app.c socket.c src/external/mpl/bind/dist/lib/isccfg: aclconf.c parser.c src/external/mpl/bind/dist/lib/ns: client.c interfacemgr.c query.c stats.c update.c src/external/mpl/bind/dist/lib/ns/include/ns: client.h stats.h src/external/mpl/bind/dist/lib/samples: nsprobe.c src/external/mpl/bind/include: config.h Removed Files: src/external/mpl/bind/dist/bin/tests/system/checkzone/zones: .gitattributes src/external/mpl/bind/dist/doc/arm: notes-bug-fixes.xml notes-new-features.xml notes-sec-fixes.xml Log Message: merge bind 9.14.8 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/bind2netbsd cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/configure cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/check/check-tool.c cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/delv/delv.c cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/bin/dig/dighost.c cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/bin/dig/host.c cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/dig/nslookup.c cvs rdiff -u -r1.6 -r1.7 \ src/external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/bin/dnssec/dnssec-importkey.c \ src/external/mpl/bind/dist/bin/dnssec/dnssec-signzone.c cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/bin/named/config.c \ src/external/mpl/bind/dist/bin/named/main.c cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/bin/named/server.c cvs rdiff -u -r1.5 -r1.6
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src Committed By: christos Date: Sat Nov 16 19:23:56 UTC 2019 Modified Files: src/external/mpl/bind/dist/lib/isc: task.c timer.c Log Message: shorten names To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isc/task.c cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/timer.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Sat Nov 16 19:23:56 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc: task.c timer.c
Log Message:
shorten names
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isc/task.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/timer.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/bind/dist/lib/isc/task.c
diff -u src/external/mpl/bind/dist/lib/isc/task.c:1.5 src/external/mpl/bind/dist/lib/isc/task.c:1.6
--- src/external/mpl/bind/dist/lib/isc/task.c:1.5 Thu Sep 5 15:32:59 2019
+++ src/external/mpl/bind/dist/lib/isc/task.c Sat Nov 16 14:23:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: task.c,v 1.5 2019/09/05 19:32:59 christos Exp $ */
+/* $NetBSD: task.c,v 1.6 2019/11/16 19:23:56 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1385,7 +1385,7 @@ isc_taskmgr_create(isc_mem_t *mctx, unsi
>queues[i].thread)
== ISC_R_SUCCESS);
char name[21];
- snprintf(name, sizeof(name), "isc-worker%04u", i);
+ snprintf(name, sizeof(name), "work-%u", i);
isc_thread_setname(manager->queues[i].thread, name);
}
UNLOCK(>lock);
Index: src/external/mpl/bind/dist/lib/isc/timer.c
diff -u src/external/mpl/bind/dist/lib/isc/timer.c:1.4 src/external/mpl/bind/dist/lib/isc/timer.c:1.5
--- src/external/mpl/bind/dist/lib/isc/timer.c:1.4 Sun Feb 24 15:01:31 2019
+++ src/external/mpl/bind/dist/lib/isc/timer.c Sat Nov 16 14:23:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.c,v 1.4 2019/02/24 20:01:31 christos Exp $ */
+/* $NetBSD: timer.c,v 1.5 2019/11/16 19:23:56 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -725,7 +725,7 @@ isc_timermgr_create(isc_mem_t *mctx, isc
"isc_thread_create() failed");
return (ISC_R_UNEXPECTED);
}
- isc_thread_setname(manager->thread, "isc-timer");
+ isc_thread_setname(manager->thread, "timer");
*managerp = (isc_timermgr_t *)manager;
CVS commit: src/external/mpl/bind/include
Module Name:src Committed By: christos Date: Thu Oct 17 16:53:06 UTC 2019 Modified Files: src/external/mpl/bind/include: config.h Log Message: remove LD_WRAP To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/include
Module Name:src Committed By: christos Date: Thu Oct 17 16:53:06 UTC 2019 Modified Files: src/external/mpl/bind/include: config.h Log Message: remove LD_WRAP To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/include/config.h 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/bind/include/config.h diff -u src/external/mpl/bind/include/config.h:1.7 src/external/mpl/bind/include/config.h:1.8 --- src/external/mpl/bind/include/config.h:1.7 Thu Oct 17 12:47:02 2019 +++ src/external/mpl/bind/include/config.h Thu Oct 17 12:53:06 2019 @@ -492,9 +492,6 @@ /* Define to allow building of objects for dlopen(). */ #define ISC_DLZ_DLOPEN 1 -/* define if the linker supports --wrap option */ -#define LD_WRAP 1 - /* have __attribute__s used in librpz.h */ #define LIBRPZ_HAVE_ATTR 1
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Thu Oct 17 16:47:02 UTC 2019 Modified Files: src/external/mpl/bind: bind2netbsd src/external/mpl/bind/dist: config.h.in configure src/external/mpl/bind/dist/bin/dig: dighost.c src/external/mpl/bind/dist/bin/dnssec: dnssec-dsfromkey.c src/external/mpl/bind/dist/bin/named: config.c main.c server.c statschannel.c zoneconf.c src/external/mpl/bind/dist/bin/named/win32: os.c src/external/mpl/bind/dist/bin/tests/optional: nsecify.c src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: create.c find.c genrsa.c login.c privrsa.c pubrsa.c session.c sha1.c sign.c verify.c src/external/mpl/bind/dist/bin/tools: mdig.c src/external/mpl/bind/dist/bin/win32/BINDInstall: resource.h src/external/mpl/bind/dist/contrib/dlz/modules/mysqldyn: dlz_mysqldyn_mod.c src/external/mpl/bind/dist/doc/arm: Bv9ARM.pdf src/external/mpl/bind/dist/fuzz: dns_rdata_fromwire_text.c src/external/mpl/bind/dist/lib/dns: dnssec.c dst_api.c ecdb.c message.c name.c nsec.c openssldh_link.c opensslrsa_link.c rbt.c rcode.c resolver.c rpz.c sdb.c ttl.c zone.c zoneverify.c src/external/mpl/bind/dist/lib/dns/include/dns: message.h src/external/mpl/bind/dist/lib/dns/rdata/generic: opt_41.c src/external/mpl/bind/dist/lib/dns/tests: rbt_serialize_test.c src/external/mpl/bind/dist/lib/irs/win32: resconf.c src/external/mpl/bind/dist/lib/isc: lex.c ratelimiter.c siphash.c sockaddr.c src/external/mpl/bind/dist/lib/isc/include/isc: siphash.h socket.h src/external/mpl/bind/dist/lib/isc/tests: hmac_test.c md_test.c queue_test.c random_test.c siphash_test.c task_test.c src/external/mpl/bind/dist/lib/isc/unix: resource.c socket.c src/external/mpl/bind/dist/lib/isc/win32: file.c ntgroups.c socket.c time.c src/external/mpl/bind/dist/lib/isc/win32/include/isc: stdatomic.h src/external/mpl/bind/dist/lib/isccfg: namedconf.c parser.c src/external/mpl/bind/dist/lib/ns: client.c src/external/mpl/bind/include: config.h Removed Files: src/external/mpl/bind/dist/bin/pkcs11: Makefile src/external/mpl/bind/dist/bin/tests/pkcs11: Makefile src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: Makefile src/external/mpl/bind/dist/bin/tests/system/dlzexternal/ns1: dlzs.conf src/external/mpl/bind/dist/bin/tests/system/glue: xx.good yy.good src/external/mpl/bind/dist/bin/tests/system/glue/ns1: cache.in mil.db src/external/mpl/bind/dist/bin/tests/virtual-time: Makefile conf.sh src/external/mpl/bind/dist/contrib/scripts: check-secure-delegation.pl zone-edit.sh src/external/mpl/bind/dist/lib/dns/tests: tkey_test.c src/external/mpl/bind/dist/lib/samples: Makefile-postinstall src/external/mpl/bind/dist/unit: unittest.sh Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/bind2netbsd cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/config.h.in \ src/external/mpl/bind/dist/configure cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/dig/dighost.c cvs rdiff -u -r1.5 -r1.6 \ src/external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/named/config.c \ src/external/mpl/bind/dist/bin/named/main.c cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/bin/named/server.c cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/named/statschannel.c \ src/external/mpl/bind/dist/bin/named/zoneconf.c cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/named/win32/os.c cvs rdiff -u -r1.1.1.1 -r0 src/external/mpl/bind/dist/bin/pkcs11/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/bin/tests/optional/nsecify.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/bin/tests/pkcs11/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/create.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/find.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/genrsa.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/login.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/privrsa.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/pubrsa.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/session.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/sha1.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/sign.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/verify.c cvs rdiff -u -r1.1.1.1 -r0 \
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Thu Oct 17 16:47:02 UTC 2019 Modified Files: src/external/mpl/bind: bind2netbsd src/external/mpl/bind/dist: config.h.in configure src/external/mpl/bind/dist/bin/dig: dighost.c src/external/mpl/bind/dist/bin/dnssec: dnssec-dsfromkey.c src/external/mpl/bind/dist/bin/named: config.c main.c server.c statschannel.c zoneconf.c src/external/mpl/bind/dist/bin/named/win32: os.c src/external/mpl/bind/dist/bin/tests/optional: nsecify.c src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: create.c find.c genrsa.c login.c privrsa.c pubrsa.c session.c sha1.c sign.c verify.c src/external/mpl/bind/dist/bin/tools: mdig.c src/external/mpl/bind/dist/bin/win32/BINDInstall: resource.h src/external/mpl/bind/dist/contrib/dlz/modules/mysqldyn: dlz_mysqldyn_mod.c src/external/mpl/bind/dist/doc/arm: Bv9ARM.pdf src/external/mpl/bind/dist/fuzz: dns_rdata_fromwire_text.c src/external/mpl/bind/dist/lib/dns: dnssec.c dst_api.c ecdb.c message.c name.c nsec.c openssldh_link.c opensslrsa_link.c rbt.c rcode.c resolver.c rpz.c sdb.c ttl.c zone.c zoneverify.c src/external/mpl/bind/dist/lib/dns/include/dns: message.h src/external/mpl/bind/dist/lib/dns/rdata/generic: opt_41.c src/external/mpl/bind/dist/lib/dns/tests: rbt_serialize_test.c src/external/mpl/bind/dist/lib/irs/win32: resconf.c src/external/mpl/bind/dist/lib/isc: lex.c ratelimiter.c siphash.c sockaddr.c src/external/mpl/bind/dist/lib/isc/include/isc: siphash.h socket.h src/external/mpl/bind/dist/lib/isc/tests: hmac_test.c md_test.c queue_test.c random_test.c siphash_test.c task_test.c src/external/mpl/bind/dist/lib/isc/unix: resource.c socket.c src/external/mpl/bind/dist/lib/isc/win32: file.c ntgroups.c socket.c time.c src/external/mpl/bind/dist/lib/isc/win32/include/isc: stdatomic.h src/external/mpl/bind/dist/lib/isccfg: namedconf.c parser.c src/external/mpl/bind/dist/lib/ns: client.c src/external/mpl/bind/include: config.h Removed Files: src/external/mpl/bind/dist/bin/pkcs11: Makefile src/external/mpl/bind/dist/bin/tests/pkcs11: Makefile src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: Makefile src/external/mpl/bind/dist/bin/tests/system/dlzexternal/ns1: dlzs.conf src/external/mpl/bind/dist/bin/tests/system/glue: xx.good yy.good src/external/mpl/bind/dist/bin/tests/system/glue/ns1: cache.in mil.db src/external/mpl/bind/dist/bin/tests/virtual-time: Makefile conf.sh src/external/mpl/bind/dist/contrib/scripts: check-secure-delegation.pl zone-edit.sh src/external/mpl/bind/dist/lib/dns/tests: tkey_test.c src/external/mpl/bind/dist/lib/samples: Makefile-postinstall src/external/mpl/bind/dist/unit: unittest.sh Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/bind2netbsd cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/config.h.in \ src/external/mpl/bind/dist/configure cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/dig/dighost.c cvs rdiff -u -r1.5 -r1.6 \ src/external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/named/config.c \ src/external/mpl/bind/dist/bin/named/main.c cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/bin/named/server.c cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/named/statschannel.c \ src/external/mpl/bind/dist/bin/named/zoneconf.c cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/named/win32/os.c cvs rdiff -u -r1.1.1.1 -r0 src/external/mpl/bind/dist/bin/pkcs11/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/bin/tests/optional/nsecify.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/bin/tests/pkcs11/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/create.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/find.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/genrsa.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/login.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/privrsa.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/pubrsa.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/session.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/sha1.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/sign.c \ src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/verify.c cvs rdiff -u -r1.1.1.1 -r0 \
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Wed Oct 2 15:43:15 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc: siphash.c
Log Message:
PR/54594: Martin Husemann: bind may crash at startup
Use memcpy(3) instead of assuming casting "uint8_t *" to "uint64_t *" and
de-referencing works.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/isc/siphash.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/bind/dist/lib/isc/siphash.c
diff -u src/external/mpl/bind/dist/lib/isc/siphash.c:1.2 src/external/mpl/bind/dist/lib/isc/siphash.c:1.3
--- src/external/mpl/bind/dist/lib/isc/siphash.c:1.2 Thu Sep 5 15:32:59 2019
+++ src/external/mpl/bind/dist/lib/isc/siphash.c Wed Oct 2 11:43:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: siphash.c,v 1.2 2019/09/05 19:32:59 christos Exp $ */
+/* $NetBSD: siphash.c,v 1.3 2019/10/02 15:43:15 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -60,9 +60,13 @@
void
isc_siphash24(const uint8_t *k, const uint8_t *in, size_t inlen, uint8_t *out)
{
- const uint64_t *key = (const uint64_t *)k;
- uint64_t k0 = le64toh(key[0]);
- uint64_t k1 = le64toh(key[1]);
+ uint64_t k0, k1;
+
+ memcpy(, k, sizeof(k0));
+ memcpy(, k + sizeof(k0), sizeof(k1));
+
+ k0 = le64toh(k0);
+ k1 = le64toh(k1);
uint64_t v0 = 0x736f6d6570736575ULL ^ k0;
uint64_t v1 = 0x646f72616e646f6dULL ^ k1;
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src Committed By: christos Date: Wed Oct 2 15:43:15 UTC 2019 Modified Files: src/external/mpl/bind/dist/lib/isc: siphash.c Log Message: PR/54594: Martin Husemann: bind may crash at startup Use memcpy(3) instead of assuming casting "uint8_t *" to "uint64_t *" and de-referencing works. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/isc/siphash.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist
Module Name:src Committed By: christos Date: Thu Sep 12 17:04:18 UTC 2019 Removed Files: src/external/mpl/bind/dist: o Log Message: remove bad file To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/mpl/bind/dist/o Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind
Module Name:src
Committed By: christos
Date: Mon Sep 9 14:40:40 UTC 2019
Modified Files:
src/external/mpl/bind: Makefile.inc
src/external/mpl/bind/bin/named: Makefile
src/external/mpl/bind/dist/bin/named: main.c
src/external/mpl/bind/dist/lib/ns: Makefile.in query.c update.c
xfrout.c
src/external/mpl/bind/lib/libns: Makefile
Added Files:
src/external/mpl/bind/dist/lib/ns: pfilter.c
src/external/mpl/bind/dist/lib/ns/include/ns: pfilter.h
Removed Files:
src/external/mpl/bind/dist/bin/named: pfilter.c pfilter.h
Log Message:
put back the blacklistd integration that got lost in the bsd -> mpl move.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/bin/named/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/named/main.c
cvs rdiff -u -r1.1 -r0 src/external/mpl/bind/dist/bin/named/pfilter.c \
src/external/mpl/bind/dist/bin/named/pfilter.h
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/mpl/bind/dist/lib/ns/Makefile.in
cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/dist/lib/ns/pfilter.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/ns/query.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/ns/update.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/ns/xfrout.c
cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/dist/lib/ns/include/ns/pfilter.h
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/lib/libns/Makefile
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/bind/Makefile.inc
diff -u src/external/mpl/bind/Makefile.inc:1.4 src/external/mpl/bind/Makefile.inc:1.5
--- src/external/mpl/bind/Makefile.inc:1.4 Thu Feb 28 17:18:21 2019
+++ src/external/mpl/bind/Makefile.inc Mon Sep 9 10:40:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2019/02/28 22:18:21 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2019/09/09 14:40:39 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -77,6 +77,9 @@ CPPFLAGS+= -DLIBINTERFACE=${LIBINTERFACE
#CPPFLAGS+= -DUSE_MEMIMPREGISTER -DUSE_APPIMPREGISTER -DUSE_SOCKETIMPREGISTER \
#-DUSE_TIMERIMPREGISTER
+LDADD+=-lblacklist
+DPADD+=${LIBBLACKLIST}
+
.if ${NAMED_USE_PTHREADS} == "yes"
# XXX: Not ready yet
# CPPFLAGS+= -DISC_PLATFORM_USE_NATIVE_RWLOCKS
Index: src/external/mpl/bind/bin/named/Makefile
diff -u src/external/mpl/bind/bin/named/Makefile:1.2 src/external/mpl/bind/bin/named/Makefile:1.3
--- src/external/mpl/bind/bin/named/Makefile:1.2 Tue Aug 14 07:52:56 2018
+++ src/external/mpl/bind/bin/named/Makefile Mon Sep 9 10:40:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/08/14 11:52:56 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/09 14:40:39 christos Exp $
LDADD+=-lns
DPADD+=${LIBNS}
@@ -35,11 +35,9 @@ SRCS_UNIX= os.c dlz_dlopen_driver.c
SRCS= builtin.c config.c control.c controlconf.c \
log.c logconf.c \
main.c server.c statschannel.c \
- pfilter.c tkeyconf.c tsigconf.c \
+ tkeyconf.c tsigconf.c \
zoneconf.c ${SRCS_UNIX}
main.o: ${VERSIONFILE}
-LDADD+=-lblacklist
-DPADD+=${LIBBLACKLIST}
.include
Index: src/external/mpl/bind/dist/bin/named/main.c
diff -u src/external/mpl/bind/dist/bin/named/main.c:1.4 src/external/mpl/bind/dist/bin/named/main.c:1.5
--- src/external/mpl/bind/dist/bin/named/main.c:1.4 Sun Feb 24 15:01:27 2019
+++ src/external/mpl/bind/dist/bin/named/main.c Mon Sep 9 10:40:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.4 2019/02/24 20:01:27 christos Exp $ */
+/* $NetBSD: main.c,v 1.5 2019/09/09 14:40:39 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -89,7 +89,7 @@
#include
#endif
-#include "pfilter.h"
+#include
/*
* Include header files for database drivers here.
*/
@@ -1404,7 +1404,7 @@ main(int argc, char *argv[]) {
parse_command_line(argc, argv);
- pfilter_open();
+ pfilter_enable();
#ifdef ENABLE_AFL
if (named_g_fuzz_type != isc_fuzz_none) {
Index: src/external/mpl/bind/dist/lib/ns/Makefile.in
diff -u src/external/mpl/bind/dist/lib/ns/Makefile.in:1.1.1.4 src/external/mpl/bind/dist/lib/ns/Makefile.in:1.2
--- src/external/mpl/bind/dist/lib/ns/Makefile.in:1.1.1.4 Thu Sep 5 15:27:41 2019
+++ src/external/mpl/bind/dist/lib/ns/Makefile.in Mon Sep 9 10:40:40 2019
@@ -42,11 +42,11 @@ LIBS = @LIBS@
OBJS = client.@O@ hooks.@O@ interfacemgr.@O@ lib.@O@ \
listenlist.@O@ log.@O@ notify.@O@ query.@O@ \
server.@O@ sortlist.@O@ stats.@O@ update.@O@ \
- version.@O@ xfrout.@O@
+ version.@O@ xfrout.@O@ pfilter.@O@
SRCS = client.c hooks.c interfacemgr.c lib.c listenlist.c \
log.c notify.c query.c server.c sortlist.c stats.c \
- update.c version.c xfrout.c
+ update.c version.c xfrout.c pfilter.c
SUBDIRS = include
TESTDIRS = @UNITTESTS@
Index: src/external/mpl/bind/dist/lib/ns/query.c
diff -u
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Mon Sep 9 14:40:40 UTC 2019 Modified Files: src/external/mpl/bind: Makefile.inc src/external/mpl/bind/bin/named: Makefile src/external/mpl/bind/dist/bin/named: main.c src/external/mpl/bind/dist/lib/ns: Makefile.in query.c update.c xfrout.c src/external/mpl/bind/lib/libns: Makefile Added Files: src/external/mpl/bind/dist/lib/ns: pfilter.c src/external/mpl/bind/dist/lib/ns/include/ns: pfilter.h Removed Files: src/external/mpl/bind/dist/bin/named: pfilter.c pfilter.h Log Message: put back the blacklistd integration that got lost in the bsd -> mpl move. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/bin/named/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/named/main.c cvs rdiff -u -r1.1 -r0 src/external/mpl/bind/dist/bin/named/pfilter.c \ src/external/mpl/bind/dist/bin/named/pfilter.h cvs rdiff -u -r1.1.1.4 -r1.2 src/external/mpl/bind/dist/lib/ns/Makefile.in cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/dist/lib/ns/pfilter.c cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/ns/query.c cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/ns/update.c cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/ns/xfrout.c cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/dist/lib/ns/include/ns/pfilter.h cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/lib/libns/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Thu Sep 5 19:33:01 UTC 2019 Modified Files: src/external/mpl/bind/dist: Makefile.in config.h.in configure src/external/mpl/bind/dist/bin/dig: dig.1 dig.c dighost.c src/external/mpl/bind/dist/bin/named: bind9.xsl.h config.c fuzz.c geoip.c named.conf.5 server.c statschannel.c zoneconf.c src/external/mpl/bind/dist/bin/named/include/named: geoip.h globals.h src/external/mpl/bind/dist/bin/named/unix: dlz_dlopen_driver.c src/external/mpl/bind/dist/bin/named/win32: ntservice.c os.c src/external/mpl/bind/dist/bin/pkcs11: pkcs11-keygen.c src/external/mpl/bind/dist/bin/plugins: filter-.c src/external/mpl/bind/dist/bin/rndc: rndc.8 src/external/mpl/bind/dist/bin/tests/system: feature-test.c src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c src/external/mpl/bind/dist/bin/tests/system/dyndb/driver: driver.c src/external/mpl/bind/dist/bin/tools: dnstap-read.c mdig.c src/external/mpl/bind/dist/contrib/dlz/modules/common: dlz_dbi.c src/external/mpl/bind/dist/fuzz: dns_rdata_fromwire_text.c src/external/mpl/bind/dist/lib/bind9: check.c src/external/mpl/bind/dist/lib/dns: acl.c client.c dispatch.c dnstap.c gen-unix.h gen.c geoip2.c master.c masterdump.c message.c name.c openssleddsa_link.c rbtdb.c rdata.c resolver.c rpz.c stats.c update.c view.c zone.c src/external/mpl/bind/dist/lib/dns/include/dns: acl.h clientinfo.h ecs.h geoip.h message.h resolver.h rpz.h stats.h types.h view.h zone.h src/external/mpl/bind/dist/lib/dns/rdata/generic: ds_43.c key_25.c opt_41.c sshfp_44.c src/external/mpl/bind/dist/lib/dns/tests: acl_test.c db_test.c dbdiff_test.c dbiterator_test.c dbversion_test.c dh_test.c dispatch_test.c dnstap_test.c dnstest.c dst_test.c geoip_test.c keytable_test.c master_test.c name_test.c nsec3_test.c peer_test.c private_test.c rbt_serialize_test.c rbt_test.c rdata_test.c rdataset_test.c rdatasetstats_test.c resolver_test.c result_test.c rsa_test.c sigs_test.c time_test.c tkey_test.c tsig_test.c update_test.c zonemgr_test.c zt_test.c src/external/mpl/bind/dist/lib/irs/tests: resconf_test.c src/external/mpl/bind/dist/lib/isc: hash.c ht.c mem.c rwlock.c siphash.c sockaddr.c stats.c task.c src/external/mpl/bind/dist/lib/isc/include/isc: endian.h hash.h siphash.h util.h src/external/mpl/bind/dist/lib/isc/tests: aes_test.c buffer_test.c counter_test.c crc64_test.c errno_test.c hash_test.c heap_test.c hmac_test.c ht_test.c lex_test.c mem_test.c netaddr_test.c parse_test.c pool_test.c queue_test.c radix_test.c random_test.c regex_test.c result_test.c safe_test.c siphash_test.c sockaddr_test.c socket_test.c symtab_test.c task_test.c taskpool_test.c time_test.c timer_test.c src/external/mpl/bind/dist/lib/isc/unix: socket.c src/external/mpl/bind/dist/lib/isccc/tests: result_test.c src/external/mpl/bind/dist/lib/isccfg: aclconf.c namedconf.c parser.c src/external/mpl/bind/dist/lib/isccfg/include/isccfg: aclconf.h src/external/mpl/bind/dist/lib/isccfg/tests: parser_test.c src/external/mpl/bind/dist/lib/ns: client.c interfacemgr.c query.c xfrout.c src/external/mpl/bind/dist/lib/ns/include/ns: client.h interfacemgr.h types.h src/external/mpl/bind/dist/lib/ns/tests: listenlist_test.c notify_test.c plugin_test.c query_test.c src/external/mpl/bind/include: config.h src/external/mpl/bind/include/dns: code.h enumtype.h rdatastruct.h src/external/mpl/bind/lib/libbind9: shlib_version src/external/mpl/bind/lib/libdns: shlib_version src/external/mpl/bind/lib/libirs: shlib_version src/external/mpl/bind/lib/libisc: Makefile shlib_version src/external/mpl/bind/lib/libisccc: shlib_version src/external/mpl/bind/lib/libisccfg: shlib_version src/external/mpl/bind/lib/libns: shlib_version Removed Files: src/external/mpl/bind/dist/bin/tests/system/wildcard/ns2: hints src/external/mpl/bind/dist/bin/tests/system/wildcard/ns3: hints src/external/mpl/bind/dist/bin/tests/system/wildcard/ns5: hints src/external/mpl/bind/dist/lib/dns/rdata/generic: unspec_103.c unspec_103.h Log Message: Merge conflicts and fix the build. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/Makefile.in cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/config.h.in \ src/external/mpl/bind/dist/configure cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/dig/dig.1 \
