CVS commit: src/external/mpl/dhcp/dist
Module Name:src
Committed By: christos
Date: Wed May 26 22:52:32 UTC 2021
Modified Files:
src/external/mpl/dhcp/dist/client: dhclient.c
src/external/mpl/dhcp/dist/common: parse.c
src/external/mpl/dhcp/dist/common/tests: option_unittest.c
src/external/mpl/dhcp/dist/relay: dhcrelay.c
src/external/mpl/dhcp/dist/relay/tests: relay_unittests.c
src/external/mpl/dhcp/dist/server: dhcpd.c
Log Message:
merge local changes between dhcp-4.4.2 and dhcp-4.4.2-P1
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/client/dhclient.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/common/parse.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/mpl/dhcp/dist/common/tests/option_unittest.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/dist/relay/dhcrelay.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/mpl/dhcp/dist/relay/tests/relay_unittests.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/server/dhcpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/dist/client/dhclient.c
diff -u src/external/mpl/dhcp/dist/client/dhclient.c:1.3 src/external/mpl/dhcp/dist/client/dhclient.c:1.4
--- src/external/mpl/dhcp/dist/client/dhclient.c:1.3 Mon Aug 3 17:10:56 2020
+++ src/external/mpl/dhcp/dist/client/dhclient.c Wed May 26 18:52:31 2021
@@ -1,11 +1,11 @@
-/* $NetBSD: dhclient.c,v 1.3 2020/08/03 21:10:56 christos Exp $ */
+/* $NetBSD: dhclient.c,v 1.4 2021/05/26 22:52:31 christos Exp $ */
/* dhclient.c
DHCP Client. */
/*
- * Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2021 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1995-2003 by Internet Software Consortium
*
* This Source Code Form is subject to the terms of the Mozilla Public
@@ -33,7 +33,7 @@
*/
#include
-__RCSID("$NetBSD: dhclient.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: dhclient.c,v 1.4 2021/05/26 22:52:31 christos Exp $");
#include "dhcpd.h"
#include
@@ -84,7 +84,7 @@ int decline_wait_time = 10; /* Default t
#define ASSERT_STATE(state_is, state_shouldbe) {}
#ifndef UNIT_TEST
-static const char copyright[] = "Copyright 2004-2020 Internet Systems Consortium.";
+static const char copyright[] = "Copyright 2004-2021 Internet Systems Consortium.";
static const char arr [] = "All rights reserved.";
static const char message [] = "Internet Systems Consortium DHCP Client";
static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/";;
@@ -241,7 +241,7 @@ add_interfaces(char **ifaces, int niface
*/
#include
-__RCSID("$NetBSD: dhclient.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: dhclient.c,v 1.4 2021/05/26 22:52:31 christos Exp $");
#if defined(DHCPv6) && defined(DHCP4o6)
static void dhcp4o6_poll(void *dummy);
@@ -1230,7 +1230,7 @@ int find_subnet (struct subnet **sp,
*/
#include
-__RCSID("$NetBSD: dhclient.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: dhclient.c,v 1.4 2021/05/26 22:52:31 christos Exp $");
void state_reboot (cpp)
void *cpp;
Index: src/external/mpl/dhcp/dist/common/parse.c
diff -u src/external/mpl/dhcp/dist/common/parse.c:1.3 src/external/mpl/dhcp/dist/common/parse.c:1.4
--- src/external/mpl/dhcp/dist/common/parse.c:1.3 Mon Aug 3 17:10:56 2020
+++ src/external/mpl/dhcp/dist/common/parse.c Wed May 26 18:52:31 2021
@@ -1,11 +1,11 @@
-/* $NetBSD: parse.c,v 1.3 2020/08/03 21:10:56 christos Exp $ */
+/* $NetBSD: parse.c,v 1.4 2021/05/26 22:52:31 christos Exp $ */
/* parse.c
Common parser code for dhcpd and dhclient. */
/*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2021 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1995-2003 by Internet Software Consortium
*
* This Source Code Form is subject to the terms of the Mozilla Public
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: parse.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.4 2021/05/26 22:52:31 christos Exp $");
#include "dhcpd.h"
#include
@@ -5561,13 +5561,14 @@ int parse_X (cfile, buf, max)
skip_to_semi (cfile);
return 0;
}
- convert_num (cfile, &buf [len], val, 16, 8);
- if (len++ > max) {
+ if (len >= max) {
parse_warn (cfile,
"hexadecimal constant too long.");
skip_to_semi (cfile);
return 0;
}
+ convert_num (cfile, &buf [len], val, 16, 8);
+ len++;
token = peek_token (&val, (unsigned *)0, cfile);
if (token == COLON)
token = next_token (&val,
Index: src/external/mpl/dhcp/dist/common/tests/option_unittest.c
diff -u src/external/mpl/dhcp/dist/common/tests/option_unittest.c:1.2 src/external/mpl/dhcp/dist/common/tests/option_unittest.c:1.3
--- src/external/mpl/dhcp/dist/common/tests/option_unittest.c:1.2 Sat Apr
CVS commit: src/external/mpl/dhcp/dist/relay
Module Name:src
Committed By: christos
Date: Fri May 21 21:07:37 UTC 2021
Modified Files:
src/external/mpl/dhcp/dist/relay: dhcrelay.c
Log Message:
Add missing call to libdhcp_callbacks_register(). Should stop
dhcrelay() crashing when accessing *libdhcp_callbacks.local_port.
(from mrg@)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/relay/dhcrelay.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/dist/relay/dhcrelay.c
diff -u src/external/mpl/dhcp/dist/relay/dhcrelay.c:1.3 src/external/mpl/dhcp/dist/relay/dhcrelay.c:1.4
--- src/external/mpl/dhcp/dist/relay/dhcrelay.c:1.3 Mon Aug 3 17:10:57 2020
+++ src/external/mpl/dhcp/dist/relay/dhcrelay.c Fri May 21 17:07:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dhcrelay.c,v 1.3 2020/08/03 21:10:57 christos Exp $ */
+/* $NetBSD: dhcrelay.c,v 1.4 2021/05/21 21:07:37 christos Exp $ */
/* dhcrelay.c
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: dhcrelay.c,v 1.3 2020/08/03 21:10:57 christos Exp $");
+__RCSID("$NetBSD: dhcrelay.c,v 1.4 2021/05/21 21:07:37 christos Exp $");
#include "dhcpd.h"
#include
@@ -264,7 +264,7 @@ char *progname;
*/
#include
-__RCSID("$NetBSD: dhcrelay.c,v 1.3 2020/08/03 21:10:57 christos Exp $");
+__RCSID("$NetBSD: dhcrelay.c,v 1.4 2021/05/21 21:07:37 christos Exp $");
static const char use_noarg[] = "No argument for command: %s";
#ifdef RELAY_PORT
static const char use_port_defined[] = "Port already set, %s inappropriate";
@@ -317,6 +317,8 @@ main(int argc, char **argv) {
int local_family_set = 0;
#endif
+ libdhcp_callbacks_register(&dhcrelay_callbacks);
+
#ifdef OLD_LOG_NAME
progname = "dhcrelay";
#else
CVS commit: src/external/mpl/bind/dist/lib/isc/include/isc
Module Name:src
Committed By: rillig
Date: Tue May 4 13:40:35 UTC 2021
Modified Files:
src/external/mpl/bind/dist/lib/isc/include/isc: radix.h
Log Message:
bind: remove unnecessary CONSTCOND
Lint does not need this anymore, since 2021-01-31.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mpl/bind/dist/lib/isc/include/isc/radix.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/radix.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/radix.h:1.6 src/external/mpl/bind/dist/lib/isc/include/isc/radix.h:1.7
--- src/external/mpl/bind/dist/lib/isc/include/isc/radix.h:1.6 Mon Apr 5 11:29:49 2021
+++ src/external/mpl/bind/dist/lib/isc/include/isc/radix.h Tue May 4 13:40:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radix.h,v 1.6 2021/04/05 11:29:49 rillig Exp $ */
+/* $NetBSD: radix.h,v 1.7 2021/05/04 13:40:34 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -219,6 +219,6 @@ isc_radix_process(isc_radix_tree_t *radi
}\
}\
}\
- while (/*CONSTCOND*/0)
+ while (0)
#endif /* _RADIX_H */
CVS commit: src/external/mpl/bind/include/isc
Module Name:src Committed By: rillig Date: Tue May 4 13:16:06 UTC 2021 Modified Files: src/external/mpl/bind/include/isc: stdatomic.h Log Message: bind: fix Clang build I had already fixed this on 2021-03-27, but the fix was accidentally reverted on 2021-04-29 when updating to bind 9.16.15. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/include/isc/stdatomic.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/isc/stdatomic.h diff -u src/external/mpl/bind/include/isc/stdatomic.h:1.6 src/external/mpl/bind/include/isc/stdatomic.h:1.7 --- src/external/mpl/bind/include/isc/stdatomic.h:1.6 Thu Apr 29 17:26:14 2021 +++ src/external/mpl/bind/include/isc/stdatomic.h Tue May 4 13:16:06 2021 @@ -142,7 +142,7 @@ typedef uintmax_t atomic_uintmax_t; __c11_atomic_compare_exchange_weak_explicit(obj, expected, desired, \ succ, fail) #define atomic_exchange_explicit(obj, desired, order) \ - __c11_atomic_exchange_explicit(obj, expected, order) + __c11_atomic_exchange_explicit(obj, desired, order) #elif defined(__GNUC_ATOMICS) /* __atomic builtins */ #define atomic_init(obj, desired) (*obj = desired) #define atomic_load_explicit(obj, order) __atomic_load_n(obj, order)
CVS commit: src/external/mpl/dhcp
Module Name:src
Committed By: mrg
Date: Tue Apr 13 04:14:46 UTC 2021
Modified Files:
src/external/mpl/dhcp: Makefile.inc
Log Message:
use -fcommon here too.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/dhcp/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/dhcp/Makefile.inc
diff -u src/external/mpl/dhcp/Makefile.inc:1.9 src/external/mpl/dhcp/Makefile.inc:1.10
--- src/external/mpl/dhcp/Makefile.inc:1.9 Sat Feb 20 01:43:04 2021
+++ src/external/mpl/dhcp/Makefile.inc Tue Apr 13 04:14:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2021/02/20 01:43:04 christos Exp $
+# $NetBSD: Makefile.inc,v 1.10 2021/04/13 04:14:46 mrg Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -61,3 +61,5 @@ LDADD+=-Wl,-Bdynamic
.endif
DPADD+= ${COBJDIR}/libdhcp.a
DPADD+= ${OMOBJDIR}/libomapi.a
+
+COPTS+= -fcommon
CVS commit: src/external/mpl/bind
Module Name:src
Committed By: mrg
Date: Tue Apr 13 01:15:57 UTC 2021
Modified Files:
src/external/mpl/bind: Makefile.inc
Log Message:
use -fcommon.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.10 src/external/mpl/bind/Makefile.inc:1.11
--- src/external/mpl/bind/Makefile.inc:1.10 Fri Feb 19 16:42:08 2021
+++ src/external/mpl/bind/Makefile.inc Tue Apr 13 01:15:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2021/02/19 16:42:08 christos Exp $
+# $NetBSD: Makefile.inc,v 1.11 2021/04/13 01:15:57 mrg Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -141,3 +141,5 @@ CPPFLAGS+=-I${IDIST}/lib/isc/nothreads/i
.include "${.PARSEDIR}/../Makefile.inc"
.endif
.endif
+
+COPTS+= -fcommon
CVS commit: src/external/mpl/bind/dist
Module Name:src
Committed By: rillig
Date: Mon Apr 5 11:36:56 UTC 2021
Modified Files:
src/external/mpl/bind/dist/bin/named: server.c
src/external/mpl/bind/dist/lib/dns: dnsrps.c dnssec.c gen.c peer.c
src/external/mpl/bind/dist/lib/dns/tests: dnstest.h
src/external/mpl/bind/dist/lib/isc/netmgr: udp.c
Log Message:
bind: remove unnecessary local modifications
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/mpl/bind/dist/bin/named/server.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/dns/dnsrps.c
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/dns/dnssec.c \
src/external/mpl/bind/dist/lib/dns/gen.c
cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/lib/dns/peer.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/dns/tests/dnstest.h
cvs rdiff -u -r1.6 -r1.7 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/bin/named/server.c
diff -u src/external/mpl/bind/dist/bin/named/server.c:1.14 src/external/mpl/bind/dist/bin/named/server.c:1.15
--- src/external/mpl/bind/dist/bin/named/server.c:1.14 Mon Apr 5 11:29:49 2021
+++ src/external/mpl/bind/dist/bin/named/server.c Mon Apr 5 11:36:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.14 2021/04/05 11:29:49 rillig Exp $ */
+/* $NetBSD: server.c,v 1.15 2021/04/05 11:36:55 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -9198,6 +9198,7 @@ load_configuration(const char *filename,
goto cleanup;
}
#endif
+
#ifdef HAVE_LMDB
/*
* Reopen NZD databases.
Index: src/external/mpl/bind/dist/lib/dns/dnsrps.c
diff -u src/external/mpl/bind/dist/lib/dns/dnsrps.c:1.6 src/external/mpl/bind/dist/lib/dns/dnsrps.c:1.7
--- src/external/mpl/bind/dist/lib/dns/dnsrps.c:1.6 Fri Feb 19 16:42:15 2021
+++ src/external/mpl/bind/dist/lib/dns/dnsrps.c Mon Apr 5 11:36:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dnsrps.c,v 1.6 2021/02/19 16:42:15 christos Exp $ */
+/* $NetBSD: dnsrps.c,v 1.7 2021/04/05 11:36:55 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -15,7 +15,6 @@
#include
#include
-#include
#ifdef USE_DNSRPS
Index: src/external/mpl/bind/dist/lib/dns/dnssec.c
diff -u src/external/mpl/bind/dist/lib/dns/dnssec.c:1.8 src/external/mpl/bind/dist/lib/dns/dnssec.c:1.9
--- src/external/mpl/bind/dist/lib/dns/dnssec.c:1.8 Mon Apr 5 11:27:01 2021
+++ src/external/mpl/bind/dist/lib/dns/dnssec.c Mon Apr 5 11:36:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dnssec.c,v 1.8 2021/04/05 11:27:01 rillig Exp $ */
+/* $NetBSD: dnssec.c,v 1.9 2021/04/05 11:36:55 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -360,7 +360,7 @@ dns_dnssec_sign(const dns_name_t *name,
}
ret = dns_rdata_fromstruct(sigrdata, sig.common.rdclass,
- sig.common.rdtype, &sig, buffer);
+ sig.common.rdtype, &sig, buffer);
cleanup_array:
isc_mem_put(mctx, rdatas, nrdatas * sizeof(dns_rdata_t));
Index: src/external/mpl/bind/dist/lib/dns/gen.c
diff -u src/external/mpl/bind/dist/lib/dns/gen.c:1.8 src/external/mpl/bind/dist/lib/dns/gen.c:1.9
--- src/external/mpl/bind/dist/lib/dns/gen.c:1.8 Mon Apr 5 11:27:02 2021
+++ src/external/mpl/bind/dist/lib/dns/gen.c Mon Apr 5 11:36:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gen.c,v 1.8 2021/04/05 11:27:02 rillig Exp $ */
+/* $NetBSD: gen.c,v 1.9 2021/04/05 11:36:55 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -814,7 +814,7 @@ main(int argc, char **argv) {
fprintf(stdout, "\t\t\t*(_tp) = _d; \\\n");
fprintf(stdout, "\t\t\treturn (ISC_R_SUCCESS); \\\n");
fprintf(stdout, "\t\t} \\\n");
- fprintf(stdout, "\t} while (/*CONSTCOND*/0)\n\n");
+ fprintf(stdout, "\t} while (0)\n\n");
fprintf(stdout, "#define RDATATYPE_FROMTEXT_SW(_hash,"
"_typename,_length,_typep) \\\n");
Index: src/external/mpl/bind/dist/lib/dns/peer.c
diff -u src/external/mpl/bind/dist/lib/dns/peer.c:1.7 src/external/mpl/bind/dist/lib/dns/peer.c:1.8
--- src/external/mpl/bind/dist/lib/dns/peer.c:1.7 Mon Apr 5 10:19:34 2021
+++ src/external/mpl/bind/dist/lib/dns/peer.c Mon Apr 5 11:36:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: peer.c,v 1.7 2021/04/05 10:19:34 rillig Exp $ */
+/* $NetBSD: peer.c,v 1.8 2021/04/05 11:36:55 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -215,6 +215,7 @@ dns_peer_newprefix(isc_mem_t *mem, const
REQUIRE(peerptr != NULL && *peerptr == NULL);
peer = isc_mem_get(mem, sizeof(*peer));
+
*peer = (dns_peer_t){
.magic = DNS_PEER_MAGIC,
.address = *addr,
Index: src/external/mpl/bind/dist/lib/dns/tests/dnstest.h
diff -u src/external/mpl/bind/dist/lib/dns/tests/dnstest.h:1.5 src/external/mpl/bind/dist/lib/dns/tests/dnstest.h:1.6
--- src/external/mpl/bind/dist/lib/dns/tests/dnstest.h:1.5 Fri Feb 1
CVS commit: src/external/mpl/bind/dist
Module Name:src
Committed By: rillig
Date: Mon Apr 5 11:29:49 UTC 2021
Modified Files:
src/external/mpl/bind/dist/bin/named: server.c statschannel.c
src/external/mpl/bind/dist/lib/dns: cache.c rbt.c
src/external/mpl/bind/dist/lib/isc/include/isc: radix.h
Log Message:
bind: remove non-canonical redundant 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.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/bin/named/server.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/mpl/bind/dist/bin/named/statschannel.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/dns/cache.c
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/dns/rbt.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/mpl/bind/dist/lib/isc/include/isc/radix.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/bin/named/server.c
diff -u src/external/mpl/bind/dist/bin/named/server.c:1.13 src/external/mpl/bind/dist/bin/named/server.c:1.14
--- src/external/mpl/bind/dist/bin/named/server.c:1.13 Mon Apr 5 11:27:00 2021
+++ src/external/mpl/bind/dist/bin/named/server.c Mon Apr 5 11:29:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.13 2021/04/05 11:27:00 rillig Exp $ */
+/* $NetBSD: server.c,v 1.14 2021/04/05 11:29:49 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -3161,7 +3161,7 @@ cleanup:
result = ISC_R_RANGE; \
goto cleanup; \
} \
- } while (/*CONSTCOND*/ 0)
+ } while (0)
#define CHECK_RRL_RATE(rate, def, max_rate, name) \
do {\
@@ -3176,7 +3176,7 @@ cleanup:
rrl->rate.r = def; \
} \
rrl->rate.scaled = rrl->rate.r; \
- } while (/*CONSTCOND*/ 0)
+ } while (0)
static isc_result_t
configure_rrl(dns_view_t *view, const cfg_obj_t *config, const cfg_obj_t *map) {
Index: src/external/mpl/bind/dist/bin/named/statschannel.c
diff -u src/external/mpl/bind/dist/bin/named/statschannel.c:1.10 src/external/mpl/bind/dist/bin/named/statschannel.c:1.11
--- src/external/mpl/bind/dist/bin/named/statschannel.c:1.10 Mon Apr 5 11:27:00 2021
+++ src/external/mpl/bind/dist/bin/named/statschannel.c Mon Apr 5 11:29:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: statschannel.c,v 1.10 2021/04/05 11:27:00 rillig Exp $ */
+/* $NetBSD: statschannel.c,v 1.11 2021/04/05 11:29:49 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -177,7 +177,7 @@ static const char *gluecachestats_xmldes
xmlrc = (a);\
if (xmlrc < 0) \
goto error; \
- } while(/*CONSTCOND*/0)
+ } while (0)
/*%
* Mapping arrays to represent statistics counters in the order of our
@@ -2580,7 +2580,7 @@ render_xml_traffic(const char *url, isc_
result = (m);\
if (result != ISC_R_SUCCESS) \
goto error; \
- } while(/*CONSTCOND*/0)
+ } while (0)
#define CHECKMEM(m) \
do { \
@@ -2588,7 +2588,7 @@ render_xml_traffic(const char *url, isc_
result = ISC_R_NOMEMORY; \
goto error; \
}\
- } while(/*CONSTCOND*/0)
+ } while (0)
static void
wrap_jsonfree(isc_buffer_t *buffer, void *arg) {
Index: src/external/mpl/bind/dist/lib/dns/cache.c
diff -u src/external/mpl/bind/dist/lib/dns/cache.c:1.6 src/external/mpl/bind/dist/lib/dns/cache.c:1.7
--- src/external/mpl/bind/dist/lib/dns/cache.c:1.6 Mon Apr 5 11:27:01 2021
+++ src/external/mpl/bind/dist/lib/dns/cache.c Mon Apr 5 11:29:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cache.c,v 1.6 2021/04/05 11:27:01 rillig Exp $ */
+/* $NetBSD: cache.c,v 1.7 2021/04/05 11:29:49 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1430,7 +1430,7 @@ error:
result = ISC_R_NOMEMORY; \
goto error; \
}\
- } while(/*CONSTCOND*/0)
+ } while (0)
isc_result_t
dns_cache_renderjson(dns_cache_t *cache, void *cstats0) {
Index: src/external/mpl/bind/dist/lib/dns/rbt.c
diff -u src/external/mpl/bind/dist/lib/dns/rbt.c:1.8 src/external/mpl/bind/dist/lib/dns/rbt.c:1.9
--- src/external/mpl/bind/dist/lib/dns/rbt.c:1.8 Mon Apr 5 11:27:02 2021
+++ src/external/mpl/bind/dist/lib/dns/rbt.c Mon Apr 5 11:29:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rbt.c,v 1.8 2021/04/05 11:27:02 rillig Exp $ */
+/* $NetBSD: rbt.c,v 1.9 2021/04/05 11:29:49 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -772,7 +772,7 @@ clea
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/bin/confgen: util.h src/external/mpl/bind/dist/bin/delv: delv.c src/external/mpl/bind/dist/bin/dig: dig.c src/external/mpl/bind/dist/bin/named: controlconf.c logconf.c server.c statschannel.c tkeyconf.c zoneconf.c src/external/mpl/bind/dist/bin/named/unix: dlz_dlopen_driver.c os.c src/external/mpl/bind/dist/bin/named/win32: dlz_dlopen_driver.c src/external/mpl/bind/dist/bin/rndc: util.h src/external/mpl/bind/dist/bin/tests: makejournal.c src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c src/external/mpl/bind/dist/bin/tests/system/rsabigexponent: bigkey.c src/external/mpl/bind/dist/contrib/dlz/example: dlz_example.c src/external/mpl/bind/dist/contrib/dlz/modules/include: dlz_list.h src/external/mpl/bind/dist/lib/bind9: check.c src/external/mpl/bind/dist/lib/dns: adb.c cache.c client.c diff.c dnssec.c dnstap.c dst_api.c dst_parse.c dyndb.c gen.c gssapi_link.c gssapictx.c journal.c keymgr.c master.c masterdump.c message.c name.c nsec.c nsec3.c private.c rbt.c rbtdb.c rcode.c rdata.c resolver.c sdb.c sdlz.c spnego_asn1.c time.c timer.c tkey.c ttl.c update.c view.c xfrin.c zone.c src/external/mpl/bind/dist/lib/dns/include/dns: name.h src/external/mpl/bind/dist/lib/dns/rdata: rdatastructpre.h src/external/mpl/bind/dist/lib/dns/rdata/in_1: wks_11.c src/external/mpl/bind/dist/lib/dns/tests: dnstest.c tsig_test.c src/external/mpl/bind/dist/lib/irs: getnameinfo.c src/external/mpl/bind/dist/lib/isc: base32.c base64.c hex.c mem.c regex.c task.c src/external/mpl/bind/dist/lib/isc/include/isc: buffer.h event.h list.h mem.h region.h util.h src/external/mpl/bind/dist/lib/isc/pthreads: mutex.c src/external/mpl/bind/dist/lib/isc/tests: isctest.h src/external/mpl/bind/dist/lib/isc/unix: socket.c src/external/mpl/bind/dist/lib/isc/win32: ntgroups.c socket.c src/external/mpl/bind/dist/lib/isc/win32/include/isc: mutex.h net.h src/external/mpl/bind/dist/lib/isccc/include/isccc: util.h src/external/mpl/bind/dist/lib/isccfg: namedconf.c parser.c src/external/mpl/bind/dist/lib/isccfg/tests: duration_test.c parser_test.c src/external/mpl/bind/dist/lib/ns: hooks.c query.c server.c update.c xfrout.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. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/bin/check/check-tool.c \ src/external/mpl/bind/dist/bin/check/named-checkconf.c \ src/external/mpl/bind/dist/bin/check/named-checkzone.c cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/confgen/util.h cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/bin/delv/delv.c cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/bin/dig/dig.c cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/bin/named/controlconf.c cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/named/logconf.c \ src/external/mpl/bind/dist/bin/named/tkeyconf.c cvs rdiff -u -r1.12 -r1.13 src/external/mpl/bind/dist/bin/named/server.c cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/bin/named/statschannel.c \ src/external/mpl/bind/dist/bin/named/zoneconf.c cvs rdiff -u -r1.8 -r1.9 \ src/external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/bin/named/unix/os.c cvs rdiff -u -r1.6 -r1.7 \ src/external/mpl/bind/dist/bin/named/win32/dlz_dlopen_driver.c cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/rndc/util.h cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/tests/makejournal.c cvs rdiff -u -r1.9 -r1.10 \ src/external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c cvs rdiff -u -r1.5 -r1.6 \ src/external/mpl/bind/dist/bin/tests/system/rsabigexponent/bigkey.c cvs rdiff -u -r1.4 -r1.5 \ src/external/mpl/bind/dist/contrib/dlz/example/dlz_example.c cvs rdiff -u -r1.3 -r1.4 \ src/external/mpl/bind/dist/contrib/dlz/modules/include/dlz_list.h cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/lib/bind9/check.c cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/lib/dns/adb.c \ src/external/mpl/bind/dist/lib/dns/dnssec.c \ src/external/mpl/bind/dist/lib/dns/dyndb.c \ src/external/mpl/bind/dist/lib/dns/gen.c \ src/external/mpl/bind/dist/lib/dns/master.c \ src/external/mpl/bind/dist/lib/dns/nsec3.c \ src/exte
CVS commit: src/external/mpl/bind/dist/contrib/dlz/modules/wildcard
Module Name:src
Committed By: rillig
Date: Mon Apr 5 10:54:05 UTC 2021
Modified Files:
src/external/mpl/bind/dist/contrib/dlz/modules/wildcard:
dlz_wildcard_dynamic.c
Log Message:
bind: remove obsolete local modifications
The duplicate include has been added upstream, further up in the file.
Since lint1/tree.c 1.202 from 2021-01-31, lint no longer needs the
/*CONSTCOND*/ for do-while-0 "loops".
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mpl/bind/dist/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.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/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c
diff -u src/external/mpl/bind/dist/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c:1.4 src/external/mpl/bind/dist/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c:1.5
--- src/external/mpl/bind/dist/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c:1.4 Sun May 24 19:46:21 2020
+++ src/external/mpl/bind/dist/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c Mon Apr 5 10:54:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dlz_wildcard_dynamic.c,v 1.4 2020/05/24 19:46:21 christos Exp $ */
+/* $NetBSD: dlz_wildcard_dynamic.c,v 1.5 2021/04/05 10:54:05 rillig Exp $ */
/*
* Copyright (C) 2002 Stichting NLnet, Netherlands, sticht...@nlnet.nl.
@@ -61,8 +61,6 @@
#include
#include
-#include
-
#define DE_CONST(konst, var) \
do { \
union {\
@@ -71,7 +69,7 @@
} _u; \
_u.k = konst; \
var = _u.v;\
- } while (/*CONSTCOND*/0)
+ } while (0)
/* fnmatch() return values. */
#define FNM_NOMATCH 1 /* Match failed. */
CVS commit: src/external/mpl/bind/dist/lib
Module Name:src
Committed By: rillig
Date: Mon Apr 5 10:19:34 UTC 2021
Modified Files:
src/external/mpl/bind/dist/lib/dns: peer.c
src/external/mpl/bind/dist/lib/isc: task.c
src/external/mpl/bind/dist/lib/isc/netmgr: udp.c
src/external/mpl/bind/dist/lib/ns: client.c interfacemgr.c
Log Message:
bind: remove workaround for bugs in lint
The bugs have been fixed in lint1/init.c 1.179 from 2021-03-30.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/dns/peer.c
cvs rdiff -u -r1.11 -r1.12 src/external/mpl/bind/dist/lib/isc/task.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isc/netmgr/udp.c
cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/lib/ns/client.c
cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/lib/ns/interfacemgr.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/peer.c
diff -u src/external/mpl/bind/dist/lib/dns/peer.c:1.6 src/external/mpl/bind/dist/lib/dns/peer.c:1.7
--- src/external/mpl/bind/dist/lib/dns/peer.c:1.6 Tue Mar 23 20:59:02 2021
+++ src/external/mpl/bind/dist/lib/dns/peer.c Mon Apr 5 10:19:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: peer.c,v 1.6 2021/03/23 20:59:02 christos Exp $ */
+/* $NetBSD: peer.c,v 1.7 2021/04/05 10:19:34 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -215,8 +215,6 @@ dns_peer_newprefix(isc_mem_t *mem, const
REQUIRE(peerptr != NULL && *peerptr == NULL);
peer = isc_mem_get(mem, sizeof(*peer));
-
-#ifndef __lint__ // XXX: bug
*peer = (dns_peer_t){
.magic = DNS_PEER_MAGIC,
.address = *addr,
@@ -224,7 +222,6 @@ dns_peer_newprefix(isc_mem_t *mem, const
.mem = mem,
.transfer_format = dns_one_answer,
};
-#endif
isc_refcount_init(&peer->refs, 1);
Index: src/external/mpl/bind/dist/lib/isc/task.c
diff -u src/external/mpl/bind/dist/lib/isc/task.c:1.11 src/external/mpl/bind/dist/lib/isc/task.c:1.12
--- src/external/mpl/bind/dist/lib/isc/task.c:1.11 Tue Mar 23 20:59:03 2021
+++ src/external/mpl/bind/dist/lib/isc/task.c Mon Apr 5 10:19:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: task.c,v 1.11 2021/03/23 20:59:03 christos Exp $ */
+/* $NetBSD: task.c,v 1.12 2021/04/05 10:19:34 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1386,10 +1386,8 @@ isc_taskmgr_create(isc_mem_t *mctx, unsi
REQUIRE(managerp != NULL && *managerp == NULL);
manager = isc_mem_get(mctx, sizeof(*manager));
-#ifndef __lint__ // XXX: bug
*manager = (isc__taskmgr_t){ .common.impmagic = TASK_MANAGER_MAGIC,
.common.magic = ISCAPI_TASKMGR_MAGIC };
-#endif
atomic_store(&manager->mode, isc_taskmgrmode_normal);
isc_mutex_init(&manager->lock);
Index: src/external/mpl/bind/dist/lib/isc/netmgr/udp.c
diff -u src/external/mpl/bind/dist/lib/isc/netmgr/udp.c:1.5 src/external/mpl/bind/dist/lib/isc/netmgr/udp.c:1.6
--- src/external/mpl/bind/dist/lib/isc/netmgr/udp.c:1.5 Tue Mar 23 20:59:03 2021
+++ src/external/mpl/bind/dist/lib/isc/netmgr/udp.c Mon Apr 5 10:19:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: udp.c,v 1.5 2021/03/23 20:59:03 christos Exp $ */
+/* $NetBSD: udp.c,v 1.6 2021/04/05 10:19:34 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -543,10 +543,7 @@ isc__nm_udp_send(isc_nmhandle_t *handle,
if (isc_nm_tid() == rsock->tid) {
isc__netievent_udpsend_t ievent
-#ifndef __lint__ // XXX: bug
- = { .sock = rsock, .req = uvreq, .peer = *peer }
-#endif
- ;
+ = { .sock = rsock, .req = uvreq, .peer = *peer };
isc__nm_async_udpsend(NULL, (isc__netievent_t *)&ievent);
} else {
Index: src/external/mpl/bind/dist/lib/ns/client.c
diff -u src/external/mpl/bind/dist/lib/ns/client.c:1.13 src/external/mpl/bind/dist/lib/ns/client.c:1.14
--- src/external/mpl/bind/dist/lib/ns/client.c:1.13 Tue Mar 23 20:59:03 2021
+++ src/external/mpl/bind/dist/lib/ns/client.c Mon Apr 5 10:19:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: client.c,v 1.13 2021/03/23 20:59:03 christos Exp $ */
+/* $NetBSD: client.c,v 1.14 2021/04/05 10:19:34 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -2311,7 +2311,6 @@ ns__client_setup(ns_client_t *client, ns
* Retain these values from the existing client, but
* zero every thing else.
*/
-#ifndef __lint__ // XXX: bug
*client = (ns_client_t){ .magic = 0,
.mctx = oldmctx,
.manager = oldmgr,
@@ -2320,7 +2319,6 @@ ns__client_setup(ns_client_t *client, ns
.sendbuf = sendbuf,
.message = message,
.query = query };
-#endif
}
client->query.attributes &= ~NS_QUERYATTR_ANSWERED;
Index: src/external/mpl/bind/dist/lib/ns/interfacemgr.c
diff -u src/external/mpl/bind/dist/lib/ns/interfacemgr.c:1.10 src/external/mpl/bind/dist/lib/ns/interfacemgr.c:1.11
--- src/external/mpl/bind/dist/lib/ns/interfacemgr.c:1.10 Tue Mar 23 20:59:03 2021
+++ src/external/mpl/bind
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Sat Apr 3 22:44:44 UTC 2021
Modified Files:
src/external/mpl/bind/dist/lib/isc: app.c
Log Message:
Don't block signals if we are not bind (because if we are not bind, we don't
sigwait(2)).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/app.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/app.c
diff -u src/external/mpl/bind/dist/lib/isc/app.c:1.4 src/external/mpl/bind/dist/lib/isc/app.c:1.5
--- src/external/mpl/bind/dist/lib/isc/app.c:1.4 Fri Feb 19 11:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/app.c Sat Apr 3 18:44:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: app.c,v 1.4 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: app.c,v 1.5 2021/04/03 22:44:43 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -164,6 +164,8 @@ isc_app_ctxstart(isc_appctx_t *ctx) {
* blocked by default, ensuring that only the thread that calls
* sigwait() for them will get those signals.
*/
+ if (isc_bind9) {
+
if (sigemptyset(&sset) != 0 || sigaddset(&sset, SIGHUP) != 0 ||
sigaddset(&sset, SIGINT) != 0 || sigaddset(&sset, SIGTERM) != 0)
{
@@ -178,6 +180,8 @@ isc_app_ctxstart(isc_appctx_t *ctx) {
"isc_app_start() pthread_sigmask: %s", strbuf);
}
+ }
+
#endif /* WIN32 */
return (ISC_R_SUCCESS);
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Sat Apr 3 22:20:26 UTC 2021
Modified Files:
src/external/mpl/bind/dist/lib/isc: timer.c
src/external/mpl/bind/dist/lib/isc/netmgr: netmgr.c
src/external/mpl/bind/dist/lib/isc/unix: socket.c
Log Message:
prefixing lwp names with isc- adds no useful information and causes
truncation of the useful part.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/lib/isc/timer.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c
cvs rdiff -u -r1.20 -r1.21 src/external/mpl/bind/dist/lib/isc/unix/socket.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/timer.c
diff -u src/external/mpl/bind/dist/lib/isc/timer.c:1.7 src/external/mpl/bind/dist/lib/isc/timer.c:1.8
--- src/external/mpl/bind/dist/lib/isc/timer.c:1.7 Fri Feb 19 11:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/timer.c Sat Apr 3 18:20:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.c,v 1.7 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: timer.c,v 1.8 2021/04/03 22:20:26 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -716,7 +716,7 @@ isc_timermgr_create(isc_mem_t *mctx, isc
isc_mem_attach(mctx, &manager->mctx);
isc_condition_init(&manager->wakeup);
isc_thread_create(run, manager, &manager->thread);
- isc_thread_setname(manager->thread, "isc-timer");
+ isc_thread_setname(manager->thread, "timer");
*managerp = (isc_timermgr_t *)manager;
Index: src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c
diff -u src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c:1.4 src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c:1.5
--- src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c:1.4 Fri Feb 19 11:42:20 2021
+++ src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c Sat Apr 3 18:20:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netmgr.c,v 1.4 2021/02/19 16:42:20 christos Exp $ */
+/* $NetBSD: netmgr.c,v 1.5 2021/04/03 22:20:26 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -287,7 +287,7 @@ isc_nm_start(isc_mem_t *mctx, uint32_t w
mgr->workers_running++;
isc_thread_create(nm_thread, &mgr->workers[i], &worker->thread);
- snprintf(name, sizeof(name), "isc-net-%04zu", i);
+ snprintf(name, sizeof(name), "net-%zu", i);
isc_thread_setname(worker->thread, name);
}
Index: src/external/mpl/bind/dist/lib/isc/unix/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.20 src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.21
--- src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.20 Sun Feb 21 20:31:51 2021
+++ src/external/mpl/bind/dist/lib/isc/unix/socket.c Sat Apr 3 18:20:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.20 2021/02/22 01:31:51 christos Exp $ */
+/* $NetBSD: socket.c,v 1.21 2021/04/03 22:20:26 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -3946,7 +3946,7 @@ isc_socketmgr_create2(isc_mem_t *mctx, i
isc_thread_create(netthread, &manager->threads[i],
&manager->threads[i].thread);
char tname[1024];
- sprintf(tname, "isc-socket-%d", i);
+ sprintf(tname, "sock-%d", i);
isc_thread_setname(manager->threads[i].thread, tname);
}
CVS commit: src/external/mpl/bind
Module Name:src
Committed By: christos
Date: Wed Mar 31 04:37:51 UTC 2021
Modified Files:
src/external/mpl/bind: Makefile
Added Files:
src/external/mpl/bind/libexec: Makefile plugin.mk
src/external/mpl/bind/libexec/filter-: Makefile
Log Message:
Add plugin glue (simon@)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/libexec/Makefile \
src/external/mpl/bind/libexec/plugin.mk
cvs rdiff -u -r0 -r1.1 src/external/mpl/bind/libexec/filter-/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
diff -u src/external/mpl/bind/Makefile:1.1 src/external/mpl/bind/Makefile:1.2
--- src/external/mpl/bind/Makefile:1.1 Sun Aug 12 09:02:24 2018
+++ src/external/mpl/bind/Makefile Wed Mar 31 00:37:50 2021
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2018/08/12 13:02:24 christos Exp $
+# $NetBSD: Makefile,v 1.2 2021/03/31 04:37:50 christos Exp $
-SUBDIR+= lib .WAIT bin
+SUBDIR+= lib .WAIT libexec bin
.include
Added files:
Index: src/external/mpl/bind/libexec/Makefile
diff -u /dev/null src/external/mpl/bind/libexec/Makefile:1.1
--- /dev/null Wed Mar 31 00:37:51 2021
+++ src/external/mpl/bind/libexec/Makefile Wed Mar 31 00:37:50 2021
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2021/03/31 04:37:50 christos Exp $
+
+SUBDIR+= filter-
+
+.include
Index: src/external/mpl/bind/libexec/plugin.mk
diff -u /dev/null src/external/mpl/bind/libexec/plugin.mk:1.1
--- /dev/null Wed Mar 31 00:37:51 2021
+++ src/external/mpl/bind/libexec/plugin.mk Wed Mar 31 00:37:50 2021
@@ -0,0 +1,36 @@
+# $NetBSD: plugin.mk,v 1.1 2021/03/31 04:37:50 christos Exp $
+#
+# Based on src/lib/libpam/modules/mod.mk
+# NetBSD: mod.mk,v 1.17 2020/05/23 00:43:33 rin Exp
+
+.include "${.CURDIR}/../../Makefile.inc"
+
+DIST= ${IDIST}/bin/plugins
+.PATH.c: ${DIST}
+
+LIBDIR= /usr/libexec/named
+
+NOLINT= # don't build a lint library
+NOPROFILE= # don't build a profile library
+NOPICINSTALL= # don't install _pic.a library
+
+# Define the shared library version here, we need these variables early for
+# plugin install rules.
+SHLIB_MAJOR= 0
+SHLIB_MINOR= 0
+
+.include
+
+.if ${MKPIC} != "no"
+.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so
+libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so
+.else
+libinstall::
+.endif
+
+.include
+
+${DESTDIR}${LIBDIR}/${LIB}.so: lib${LIB}.so.${SHLIB_FULLVERSION}
+ ${_MKTARGET_INSTALL}
+ ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${.ALLSRC} ${.TARGET}
Index: src/external/mpl/bind/libexec/filter-/Makefile
diff -u /dev/null src/external/mpl/bind/libexec/filter-/Makefile:1.1
--- /dev/null Wed Mar 31 00:37:51 2021
+++ src/external/mpl/bind/libexec/filter-/Makefile Wed Mar 31 00:37:50 2021
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2021/03/31 04:37:50 christos Exp $
+
+LIB= filter-
+SRCS= filter-.c
+
+.include "${.CURDIR}/../plugin.mk"
CVS commit: src/external/mpl/bind
Module Name:src
Committed By: rillig
Date: Sat Mar 27 00:06:27 UTC 2021
Modified Files:
src/external/mpl/bind/dist/lib/isc/unix/include/isc: stdatomic.h
src/external/mpl/bind/include/isc: stdatomic.h
Log Message:
bind: fix typo in stdatomic to support lint + Clang
Before this fix, lint complained:
> dist/lib/isc/queue.c(203): error: expected undefined [99]
https://gitlab.isc.org/isc-projects/bind9/-/issues/2601
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/lib/isc/unix/include/isc/stdatomic.h
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/include/isc/stdatomic.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/unix/include/isc/stdatomic.h
diff -u src/external/mpl/bind/dist/lib/isc/unix/include/isc/stdatomic.h:1.3 src/external/mpl/bind/dist/lib/isc/unix/include/isc/stdatomic.h:1.4
--- src/external/mpl/bind/dist/lib/isc/unix/include/isc/stdatomic.h:1.3 Fri Feb 19 16:42:20 2021
+++ src/external/mpl/bind/dist/lib/isc/unix/include/isc/stdatomic.h Sat Mar 27 00:06:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: stdatomic.h,v 1.3 2021/02/19 16:42:20 christos Exp $ */
+/* $NetBSD: stdatomic.h,v 1.4 2021/03/27 00:06:27 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -144,7 +144,7 @@ typedef uintmax_t atomic_uintmax_t;
__c11_atomic_compare_exchange_weak_explicit(obj, expected, desired, \
succ, fail)
#define atomic_exchange_explicit(obj, desired, order) \
- __c11_atomic_exchange_explicit(obj, expected, order)
+ __c11_atomic_exchange_explicit(obj, desired, order)
#elif defined(__GNUC_ATOMICS) /* __atomic builtins */
#define atomic_init(obj, desired) (*obj = desired)
#define atomic_load_explicit(obj, order) __atomic_load_n(obj, order)
Index: src/external/mpl/bind/include/isc/stdatomic.h
diff -u src/external/mpl/bind/include/isc/stdatomic.h:1.4 src/external/mpl/bind/include/isc/stdatomic.h:1.5
--- src/external/mpl/bind/include/isc/stdatomic.h:1.4 Fri Feb 19 16:42:23 2021
+++ src/external/mpl/bind/include/isc/stdatomic.h Sat Mar 27 00:06:27 2021
@@ -142,7 +142,7 @@ typedef uintmax_t atomic_uintmax_t;
__c11_atomic_compare_exchange_weak_explicit(obj, expected, desired, \
succ, fail)
#define atomic_exchange_explicit(obj, desired, order) \
- __c11_atomic_exchange_explicit(obj, expected, order)
+ __c11_atomic_exchange_explicit(obj, desired, order)
#elif defined(__GNUC_ATOMICS) /* __atomic builtins */
#define atomic_init(obj, desired) (*obj = desired)
#define atomic_load_explicit(obj, order) __atomic_load_n(obj, order)
CVS commit: src/external/mpl/bind/dist/lib
Module Name:src
Committed By: christos
Date: Tue Mar 23 20:59:03 UTC 2021
Modified Files:
src/external/mpl/bind/dist/lib/dns: peer.c
src/external/mpl/bind/dist/lib/isc: task.c
src/external/mpl/bind/dist/lib/isc/netmgr: udp.c
src/external/mpl/bind/dist/lib/ns: client.c interfacemgr.c
Log Message:
Consistently comment out code that lint can't handle (yet?)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/dns/peer.c
cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/lib/isc/task.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/netmgr/udp.c
cvs rdiff -u -r1.12 -r1.13 src/external/mpl/bind/dist/lib/ns/client.c
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/ns/interfacemgr.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/peer.c
diff -u src/external/mpl/bind/dist/lib/dns/peer.c:1.5 src/external/mpl/bind/dist/lib/dns/peer.c:1.6
--- src/external/mpl/bind/dist/lib/dns/peer.c:1.5 Fri Feb 19 11:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/peer.c Tue Mar 23 16:59:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: peer.c,v 1.5 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: peer.c,v 1.6 2021/03/23 20:59:02 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -216,8 +216,7 @@ dns_peer_newprefix(isc_mem_t *mem, const
peer = isc_mem_get(mem, sizeof(*peer));
-#ifndef __lint__
-// XXX: bug
+#ifndef __lint__ // XXX: bug
*peer = (dns_peer_t){
.magic = DNS_PEER_MAGIC,
.address = *addr,
Index: src/external/mpl/bind/dist/lib/isc/task.c
diff -u src/external/mpl/bind/dist/lib/isc/task.c:1.10 src/external/mpl/bind/dist/lib/isc/task.c:1.11
--- src/external/mpl/bind/dist/lib/isc/task.c:1.10 Fri Feb 19 11:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/task.c Tue Mar 23 16:59:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: task.c,v 1.10 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: task.c,v 1.11 2021/03/23 20:59:03 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1386,8 +1386,7 @@ isc_taskmgr_create(isc_mem_t *mctx, unsi
REQUIRE(managerp != NULL && *managerp == NULL);
manager = isc_mem_get(mctx, sizeof(*manager));
-#ifndef __lint__
-// XXX: bug
+#ifndef __lint__ // XXX: bug
*manager = (isc__taskmgr_t){ .common.impmagic = TASK_MANAGER_MAGIC,
.common.magic = ISCAPI_TASKMGR_MAGIC };
#endif
Index: src/external/mpl/bind/dist/lib/isc/netmgr/udp.c
diff -u src/external/mpl/bind/dist/lib/isc/netmgr/udp.c:1.4 src/external/mpl/bind/dist/lib/isc/netmgr/udp.c:1.5
--- src/external/mpl/bind/dist/lib/isc/netmgr/udp.c:1.4 Fri Feb 19 11:42:20 2021
+++ src/external/mpl/bind/dist/lib/isc/netmgr/udp.c Tue Mar 23 16:59:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: udp.c,v 1.4 2021/02/19 16:42:20 christos Exp $ */
+/* $NetBSD: udp.c,v 1.5 2021/03/23 20:59:03 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -543,7 +543,7 @@ isc__nm_udp_send(isc_nmhandle_t *handle,
if (isc_nm_tid() == rsock->tid) {
isc__netievent_udpsend_t ievent
-#ifndef __lint__ // XXX lint broken
+#ifndef __lint__ // XXX: bug
= { .sock = rsock, .req = uvreq, .peer = *peer }
#endif
;
Index: src/external/mpl/bind/dist/lib/ns/client.c
diff -u src/external/mpl/bind/dist/lib/ns/client.c:1.12 src/external/mpl/bind/dist/lib/ns/client.c:1.13
--- src/external/mpl/bind/dist/lib/ns/client.c:1.12 Fri Feb 19 11:42:22 2021
+++ src/external/mpl/bind/dist/lib/ns/client.c Tue Mar 23 16:59:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: client.c,v 1.12 2021/02/19 16:42:22 christos Exp $ */
+/* $NetBSD: client.c,v 1.13 2021/03/23 20:59:03 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -2311,8 +2311,7 @@ ns__client_setup(ns_client_t *client, ns
* Retain these values from the existing client, but
* zero every thing else.
*/
-#ifndef __lint__
-/* XXX: bug ? */
+#ifndef __lint__ // XXX: bug
*client = (ns_client_t){ .magic = 0,
.mctx = oldmctx,
.manager = oldmgr,
Index: src/external/mpl/bind/dist/lib/ns/interfacemgr.c
diff -u src/external/mpl/bind/dist/lib/ns/interfacemgr.c:1.9 src/external/mpl/bind/dist/lib/ns/interfacemgr.c:1.10
--- src/external/mpl/bind/dist/lib/ns/interfacemgr.c:1.9 Fri Feb 19 11:42:22 2021
+++ src/external/mpl/bind/dist/lib/ns/interfacemgr.c Tue Mar 23 16:59:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: interfacemgr.c,v 1.9 2021/02/19 16:42:22 christos Exp $ */
+/* $NetBSD: interfacemgr.c,v 1.10 2021/03/23 20:59:03 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -398,8 +398,7 @@ ns_interface_create(ns_interfacemgr_t *m
REQUIRE(NS_INTERFACEMGR_VALID(mgr));
ifp = isc_mem_get(mgr->mctx, sizeof(*ifp));
-#ifndef __lint__
-/* XXX: bug? */
+#ifndef __lint__ // XXX: bug
*ifp = (ns_interface_t){ .generation = mgr->generation,
CVS commit: src/external/mpl/bind/dist/lib/isc/unix/include/isc
Module Name:src
Committed By: christos
Date: Tue Mar 23 20:57:10 UTC 2021
Modified Files:
src/external/mpl/bind/dist/lib/isc/unix/include/isc: align.h
Log Message:
We have _Alignas now
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/lib/isc/unix/include/isc/align.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/unix/include/isc/align.h
diff -u src/external/mpl/bind/dist/lib/isc/unix/include/isc/align.h:1.3 src/external/mpl/bind/dist/lib/isc/unix/include/isc/align.h:1.4
--- src/external/mpl/bind/dist/lib/isc/unix/include/isc/align.h:1.3 Fri Feb 19 11:42:20 2021
+++ src/external/mpl/bind/dist/lib/isc/unix/include/isc/align.h Tue Mar 23 16:57:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: align.h,v 1.3 2021/02/19 16:42:20 christos Exp $ */
+/* $NetBSD: align.h,v 1.4 2021/03/23 20:57:10 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -18,8 +18,3 @@
#else /* ifdef HAVE_STDALIGN_H */
#define alignas(x) __attribute__((__aligned__(x)))
#endif /* ifdef HAVE_STDALIGN_H */
-#ifdef __lint__
-// XXX: bug
-#undef alignas
-#define alignas(a)
-#endif
CVS commit: src/external/mpl/bind/dist/lib/isc/netmgr
Module Name:src
Committed By: christos
Date: Tue Mar 23 20:56:25 UTC 2021
Modified Files:
src/external/mpl/bind/dist/lib/isc/netmgr: netmgr-int.h
Log Message:
remove extra ;'s
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
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.4 src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.5
--- src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h:1.4 Fri Feb 19 11:42:20 2021
+++ src/external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h Tue Mar 23 16:56:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: netmgr-int.h,v 1.4 2021/02/19 16:42:20 christos Exp $ */
+/* $NetBSD: netmgr-int.h,v 1.5 2021/03/23 20:56:25 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -364,13 +364,13 @@ typedef struct isc__netievent__socket {
} isc__netievent__socket_t;
#define NETIEVENT_SOCKET_TYPE(type) \
- typedef isc__netievent__socket_t isc__netievent_##type##_t;
+ typedef isc__netievent__socket_t isc__netievent_##type##_t
#define NETIEVENT_SOCKET_DECL(type) \
isc__netievent_##type##_t *isc__nm_get_netievent_##type( \
isc_nm_t *nm, isc_nmsocket_t *sock); \
void isc__nm_put_netievent_##type(isc_nm_t *nm, \
- isc__netievent_##type##_t *ievent);
+ isc__netievent_##type##_t *ievent)
#define NETIEVENT_SOCKET_DEF(type) \
isc__netievent_##type##_t *isc__nm_get_netievent_##type( \
@@ -394,13 +394,13 @@ typedef struct isc__netievent__socket_re
} isc__netievent__socket_req_t;
#define NETIEVENT_SOCKET_REQ_TYPE(type) \
- typedef isc__netievent__socket_req_t isc__netievent_##type##_t;
+ typedef isc__netievent__socket_req_t isc__netievent_##type##_t
#define NETIEVENT_SOCKET_REQ_DECL(type)\
isc__netievent_##type##_t *isc__nm_get_netievent_##type( \
isc_nm_t *nm, isc_nmsocket_t *sock, isc__nm_uvreq_t *req); \
void isc__nm_put_netievent_##type(isc_nm_t *nm,\
- isc__netievent_##type##_t *ievent);
+ isc__netievent_##type##_t *ievent)
#define NETIEVENT_SOCKET_REQ_DEF(type) \
isc__netievent_##type##_t *isc__nm_get_netievent_##type( \
@@ -427,14 +427,14 @@ typedef struct isc__netievent__socket_re
} isc__netievent__socket_req_result_t;
#define NETIEVENT_SOCKET_REQ_RESULT_TYPE(type) \
- typedef isc__netievent__socket_req_result_t isc__netievent_##type##_t;
+ typedef isc__netievent__socket_req_result_t isc__netievent_##type##_t
#define NETIEVENT_SOCKET_REQ_RESULT_DECL(type)\
isc__netievent_##type##_t *isc__nm_get_netievent_##type( \
isc_nm_t *nm, isc_nmsocket_t *sock, isc__nm_uvreq_t *req, \
isc_result_t result); \
void isc__nm_put_netievent_##type(isc_nm_t *nm, \
- isc__netievent_##type##_t *ievent);
+ isc__netievent_##type##_t *ievent)
#define NETIEVENT_SOCKET_REQ_RESULT_DEF(type) \
isc__netievent_##type##_t *isc__nm_get_netievent_##type( \
@@ -461,13 +461,13 @@ typedef struct isc__netievent__socket_ha
} isc__netievent__socket_handle_t;
#define NETIEVENT_SOCKET_HANDLE_TYPE(type) \
- typedef isc__netievent__socket_handle_t isc__netievent_##type##_t;
+ typedef isc__netievent__socket_handle_t isc__netievent_##type##_t
#define NETIEVENT_SOCKET_HANDLE_DECL(type) \
isc__netievent_##type##_t *isc__nm_get_netievent_##type( \
isc_nm_t *nm, isc_nmsocket_t *sock, isc_nmhandle_t *handle); \
void isc__nm_put_netievent_##type(isc_nm_t *nm, \
- isc__netievent_##type##_t *ievent);
+ isc__netievent_##type##_t *ievent)
#define NETIEVENT_SOCKET_HANDLE_DEF(type) \
isc__netievent_##type##_t *isc__nm_get_netievent_##type( \
@@ -493,13 +493,13 @@ typedef struct isc__netievent__socket_qu
} isc__netievent__socket_quota_t;
#define NETIEVENT_SOCKET_QUOTA_TYPE(type) \
- typedef isc__netievent__socket_quota_t isc__netievent_##type##_t;
+ typedef isc__netievent__socket_quota_t isc__netievent_##type##_t
#define NETIEVENT_SOCKET_QUOTA_DECL(type)\
isc__netievent_##type##_t *isc__nm_get_netievent_##type( \
isc_nm_t *nm, isc_nmsocket_t *sock, isc_quota_t *quota); \
void isc__nm_put_netievent_##type(isc_nm_t *nm, \
- isc__netievent_##type##_t *ievent);
+ isc__netievent_##type##_t *ievent)
#define NETIEVENT_SOCKET_QUOTA_DEF(type)
CVS commit: src/external/mpl/bind/dist/lib/dns
Module Name:src
Committed By: rillig
Date: Tue Mar 23 18:46:07 UTC 2021
Modified Files:
src/external/mpl/bind/dist/lib/dns: rbtdb.c
Log Message:
bind: remove the workaround for a bug in lint for compound literals
This bug has been fixed in init.c 1.111 from a few minutes ago.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/lib/dns/rbtdb.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/rbtdb.c
diff -u src/external/mpl/bind/dist/lib/dns/rbtdb.c:1.10 src/external/mpl/bind/dist/lib/dns/rbtdb.c:1.11
--- src/external/mpl/bind/dist/lib/dns/rbtdb.c:1.10 Mon Mar 22 15:12:24 2021
+++ src/external/mpl/bind/dist/lib/dns/rbtdb.c Tue Mar 23 18:46:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rbtdb.c,v 1.10 2021/03/22 15:12:24 rillig Exp $ */
+/* $NetBSD: rbtdb.c,v 1.11 2021/03/23 18:46:07 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -892,13 +892,9 @@ update_rrsetstats(dns_rbtdb_t *rbtdb, co
dns_rdatastatstype_t statattributes = 0;
dns_rdatastatstype_t base = 0;
dns_rdatastatstype_t type;
-#ifdef __lint__ // XXX: bug in lint; see msg_171.c 1.3
- rdatasetheader_t *header;
-#else
rdatasetheader_t *header = &(rdatasetheader_t){
.type = htype, .attributes = ATOMIC_VAR_INIT(hattributes)
};
-#endif
if (!do_stats(header)) {
return;
CVS commit: src/external/mpl/bind/dist/lib/dns
Module Name:src
Committed By: rillig
Date: Mon Mar 22 15:12:24 UTC 2021
Modified Files:
src/external/mpl/bind/dist/lib/dns: rbtdb.c
Log Message:
bind: fix workaround for bug in lint
The previous attempt resulted in a 'syntax error'.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/dns/rbtdb.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/rbtdb.c
diff -u src/external/mpl/bind/dist/lib/dns/rbtdb.c:1.9 src/external/mpl/bind/dist/lib/dns/rbtdb.c:1.10
--- src/external/mpl/bind/dist/lib/dns/rbtdb.c:1.9 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/rbtdb.c Mon Mar 22 15:12:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rbtdb.c,v 1.9 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: rbtdb.c,v 1.10 2021/03/22 15:12:24 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -892,13 +892,13 @@ update_rrsetstats(dns_rbtdb_t *rbtdb, co
dns_rdatastatstype_t statattributes = 0;
dns_rdatastatstype_t base = 0;
dns_rdatastatstype_t type;
- rdatasetheader_t *header =
-#ifndef __lint__ // XXX: lint broken
- &(rdatasetheader_t){
+#ifdef __lint__ // XXX: bug in lint; see msg_171.c 1.3
+ rdatasetheader_t *header;
+#else
+ rdatasetheader_t *header = &(rdatasetheader_t){
.type = htype, .attributes = ATOMIC_VAR_INIT(hattributes)
- }
+ };
#endif
- ;
if (!do_stats(header)) {
return;
CVS commit: src/external/mpl/bind/bin/nslookup
Module Name:src Committed By: wiz Date: Sun Mar 21 21:26:00 UTC 2021 Modified Files: src/external/mpl/bind/bin/nslookup: nslookup.8 Log Message: Use standard section names, sort, use more macros. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/bin/nslookup/nslookup.8 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/nslookup/nslookup.8 diff -u src/external/mpl/bind/bin/nslookup/nslookup.8:1.3 src/external/mpl/bind/bin/nslookup/nslookup.8:1.4 --- src/external/mpl/bind/bin/nslookup/nslookup.8:1.3 Sun Mar 21 16:21:35 2021 +++ src/external/mpl/bind/bin/nslookup/nslookup.8 Sun Mar 21 21:26:00 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: nslookup.8,v 1.3 2021/03/21 16:21:35 christos Exp $ +.\" $NetBSD: nslookup.8,v 1.4 2021/03/21 21:26:00 wiz Exp $ .\" .\" .\" ++Copyright++ 1985, 1989 @@ -114,7 +114,7 @@ The command line length must be less tha To treat a built-in command as a host name, precede it with an escape character .Pq Sq \e . -.Em N.B.: An unrecognized command will be interpreted as a host name. +.Em N.B.: \&An unrecognized command will be interpreted as a host name. .Bl -tag -width "lserver" .It Ar host Op Ar server Look up information for @@ -445,7 +445,7 @@ abbreviation = .Oo Ic no Oc Ns Ic ig ) .It Oo Ic no Oc Ns Ic fail This keyword tries the next nameserver if a nameserver responds -with +with .Dv SERVFAIL or a referral (nofail), or terminates the query (fail) on such a response. @@ -453,24 +453,17 @@ or a referral (nofail), or terminates th The default is nofail. .El .El -.Sh RETURN VALUES -.Nm -returns with an exit status of -.Dv 1 -if any query failed, and -.Dv 0 -otherwise. .Sh IDN SUPPORT -If +If .Nm has been built with IDN (internationalized domain name) support, it can accept and display non-ASCII domain names. -.Nm +.Nm appropriately converts character encoding of a domain name before sending a request to a DNS server or displaying a reply from the server. To turn off IDN support, define the IDN_DISABLE environment variable. IDN support is disabled if the variable is set when -.Nm +.Nm runs, or when the standard output is not a tty. .Sh ENVIRONMENT .Bl -tag -width "HOSTALIASES" -compact @@ -486,6 +479,13 @@ turns off IDN support .It Pa /etc/resolv.conf initial domain name and name server addresses .El +.Sh EXIT STATUS +.Nm +returns with an exit status of +.Dv 1 +if any query failed, and +.Dv 0 +otherwise. .Sh DIAGNOSTICS If the lookup request was not successful, an error message is printed. Possible errors are: @@ -545,4 +545,4 @@ It may indicate an error in .%D Nov 1, 1987 .Re .Sh AUTHORS -Andrew Cherenson +.An Andrew Cherenson
CVS commit: src/external/mpl/bind/bin/nslookup
Module Name:src Committed By: christos Date: Sun Mar 21 16:21:35 UTC 2021 Modified Files: src/external/mpl/bind/bin/nslookup: nslookup.8 Log Message: revert the unintentional whitespace changes To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/bin/nslookup/nslookup.8 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/nslookup/nslookup.8 diff -u src/external/mpl/bind/bin/nslookup/nslookup.8:1.2 src/external/mpl/bind/bin/nslookup/nslookup.8:1.3 --- src/external/mpl/bind/bin/nslookup/nslookup.8:1.2 Sun Mar 21 12:12:37 2021 +++ src/external/mpl/bind/bin/nslookup/nslookup.8 Sun Mar 21 12:21:35 2021 @@ -1,27 +1,27 @@ -.\" $NetBSD: nslookup.8,v 1.2 2021/03/21 16:12:37 christos Exp $ +.\" $NetBSD: nslookup.8,v 1.3 2021/03/21 16:21:35 christos Exp $ .\" .\" .\" ++Copyright++ 1985, 1989 .\" - .\" Copyright (c) 1985, 1989 -.\" The Regents of the University of California. All rights reserved. +.\"The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. +.\"notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. .\" 3. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. +.\"may be used to endorse or promote products derived from this software +.\"without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -41,7 +41,7 @@ .\" .\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL .\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES -.\" OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT +.\" OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT .\" CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL .\" DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR .\" PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS @@ -52,7 +52,7 @@ .\" .\" @(#)nslookup.8 5.3 (Berkeley) 6/24/90 .\" -.Dd March 21, 2021 +.Dd June 24, 1990 .Dt NSLOOKUP 8 .Os .Sh NAME @@ -102,7 +102,7 @@ the arguments and are prefixed with a hy For example, to change the default query type to host information, and the initial timeout to 10 seconds, type: .Bd -literal -offset indent - nslookup -query=hinfo -timeout=10 + nslookup -query=hinfo -timeout=10 .Ed .Sh INTERACTIVE COMMANDS Commands may be interrupted at any time by typing a control-C. @@ -114,7 +114,7 @@ The command line length must be less tha To treat a built-in command as a host name, precede it with an escape character .Pq Sq \e . -.Em N.B.: An unrecognized command will be interpreted as a host name. +.Em N.B.: An unrecognized command will be interpreted as a host name. .Bl -tag -width "lserver" .It Ar host Op Ar server Look up information for @@ -187,7 +187,7 @@ optionally creating or appending to The default output contains host names and their Internet addresses. .Ar Option can be one of the following: -.Bl -tag -width "-a " +.Bl -tag -width "-a " .It Fl t Ar querytype lists all records of the specified type (see .Ar querytype @@ -229,10 +229,10 @@ Valid keywords are: .It Ic all Prints the current values of the frequently-used options to .Ic set . -Information about the current default server and host is also printed. +Information about the current default server and host is also printed. .It Ic class Ns = Ns Ar value Change the query class to one of: -.Bl -tag -width "HESIOD " +.Bl -tag -width "HESIOD "
CVS commit: src/external/mpl/bind/bin/nslookup
Module Name:src Committed By: christos Date: Sun Mar 21 16:12:37 UTC 2021 Modified Files: src/external/mpl/bind/bin/nslookup: nslookup.8 Log Message: Remove some obsolete information and add some more recent additions from the nslookup.1 page in the distribution. Consider replacing this man page with the one from the distribution, since this manual page describes options available only in the original implemementation. On the other hand, this man page is mdoc, not man... (Takahiro Kambe) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/nslookup/nslookup.8 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/nslookup/nslookup.8 diff -u src/external/mpl/bind/bin/nslookup/nslookup.8:1.1 src/external/mpl/bind/bin/nslookup/nslookup.8:1.2 --- src/external/mpl/bind/bin/nslookup/nslookup.8:1.1 Sun Aug 12 09:02:26 2018 +++ src/external/mpl/bind/bin/nslookup/nslookup.8 Sun Mar 21 12:12:37 2021 @@ -1,27 +1,27 @@ -.\" $NetBSD: nslookup.8,v 1.1 2018/08/12 13:02:26 christos Exp $ +.\" $NetBSD: nslookup.8,v 1.2 2021/03/21 16:12:37 christos Exp $ .\" .\" .\" ++Copyright++ 1985, 1989 .\" - .\" Copyright (c) 1985, 1989 -.\"The Regents of the University of California. All rights reserved. +.\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright -.\"notice, this list of conditions and the following disclaimer. +.\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright -.\"notice, this list of conditions and the following disclaimer in the -.\"documentation and/or other materials provided with the distribution. +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of the University nor the names of its contributors -.\"may be used to endorse or promote products derived from this software -.\"without specific prior written permission. +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -41,7 +41,7 @@ .\" .\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL .\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES -.\" OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT +.\" OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT .\" CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL .\" DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR .\" PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS @@ -52,7 +52,7 @@ .\" .\" @(#)nslookup.8 5.3 (Berkeley) 6/24/90 .\" -.Dd June 24, 1990 +.Dd March 21, 2021 .Dt NSLOOKUP 8 .Os .Sh NAME @@ -102,7 +102,7 @@ the arguments and are prefixed with a hy For example, to change the default query type to host information, and the initial timeout to 10 seconds, type: .Bd -literal -offset indent - nslookup -query=hinfo -timeout=10 + nslookup -query=hinfo -timeout=10 .Ed .Sh INTERACTIVE COMMANDS Commands may be interrupted at any time by typing a control-C. @@ -114,7 +114,7 @@ The command line length must be less tha To treat a built-in command as a host name, precede it with an escape character .Pq Sq \e . -.Em N.B.: An unrecognized command will be interpreted as a host name. +.Em N.B.: An unrecognized command will be interpreted as a host name. .Bl -tag -width "lserver" .It Ar host Op Ar server Look up information for @@ -187,7 +187,7 @@ optionally creating or appending to The default output contains host names and their Internet addresses. .Ar Option can be one of the following: -.Bl -tag -width "-a " +.Bl -tag -width "-a " .It Fl t Ar querytype lists all records of the specified type (see .Ar querytype @@ -229,10 +229,10 @@ Valid keywords are: .It Ic all Prints the current values of the frequ
CVS commit: src/external/mpl/bind/dist/lib/isc/unix
Module Name:src
Committed By: christos
Date: Mon Feb 22 01:31:52 UTC 2021
Modified Files:
src/external/mpl/bind/dist/lib/isc/unix: socket.c
Log Message:
Locking protocol changed again, adjust.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/mpl/bind/dist/lib/isc/unix/socket.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/unix/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.19 src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.20
--- src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.19 Fri Feb 19 11:42:20 2021
+++ src/external/mpl/bind/dist/lib/isc/unix/socket.c Sun Feb 21 20:31:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.19 2021/02/19 16:42:20 christos Exp $ */
+/* $NetBSD: socket.c,v 1.20 2021/02/22 01:31:51 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -3214,8 +3214,6 @@ internal_fdwatch_write(isc__socket_t *so
if (more_data)
select_poke(sock->manager, sock->threadid, sock->fd,
SELECT_POKE_WRITE);
-
- UNLOCK(&sock->lock);
}
static void
@@ -3242,8 +3240,6 @@ internal_fdwatch_read(isc__socket_t *soc
if (more_data)
select_poke(sock->manager, sock->threadid, sock->fd,
SELECT_POKE_READ);
-
- UNLOCK(&sock->lock);
}
/*
CVS commit: src/external/mpl/dhcp
Module Name:src
Committed By: christos
Date: Sat Feb 20 01:43:04 UTC 2021
Modified Files:
src/external/mpl/dhcp: Makefile.inc
Log Message:
libisc needs libssl now
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/dhcp/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/dhcp/Makefile.inc
diff -u src/external/mpl/dhcp/Makefile.inc:1.8 src/external/mpl/dhcp/Makefile.inc:1.9
--- src/external/mpl/dhcp/Makefile.inc:1.8 Sat May 30 16:47:59 2020
+++ src/external/mpl/dhcp/Makefile.inc Fri Feb 19 20:43:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2020/05/30 20:47:59 christos Exp $
+# $NetBSD: Makefile.inc,v 1.9 2021/02/20 01:43:04 christos Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -54,8 +54,8 @@ DPADD+= ${LIBKRB5_DPADD} ${LIBHEIMNTLM}
.if defined(PROG) && ${PROG} == "dhclient" && ${MKSANITIZER:Uno} != "yes"
LDADD+=-Wl,-Bdynamic
.endif
-LDADD+= -lcrypto -lipsec -lcrypt
-DPADD+= ${LIBCRYPTO} ${LIBIPSEC} ${LIBCRYPT}
+LDADD+= -lssl -lcrypto -lipsec -lcrypt
+DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBIPSEC} ${LIBCRYPT}
.if defined(PROG) && ${PROG} == "dhclient" && ${MKSANITIZER:Uno} != "yes"
LDADD+=-Wl,-Bdynamic
.endif
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Fri Feb 19 16:42:24 UTC 2021 Modified Files: src/external/mpl/bind: Makefile.inc src/external/mpl/bind/bin/named: Makefile src/external/mpl/bind/dist: Makefile.in 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-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 src/external/mpl/bind/dist/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d: 10.53.0.1 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 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 src/external/mpl/bind/dist/doc/arm: isc-logo.pdf src/external/mpl/bind/dist/fuzz: dns_name_fromtext_target.c dns_rdata_fromwire_text.c fuzz.h main.c src/external/mpl/bind/dist/lib/bind9: check.c getaddresses.c version.c src/external/mpl/bind/dist/lib/bind9/include/bind9: check.h getaddresses.h version.h src/external/mpl/bind/dist/lib/bind9/win32: DLLMain.c version.c src/external/mpl/bind/dist/lib/dns: acl.c adb.c badcache.c byaddr.c cache.c callbacks.c catz.c client.c clientinfo.c compress.c db.c dbiterator.c dbtable.c diff.c dispatch.c dlz.c dns64.c dnsrps.c dnssec.c dnstap.c ds.c dst_api.c dst_internal.h dst_openssl.h dst_parse.c dst_parse.h dst_pkcs11.h dst_result.c dyndb.c ecdb.c ecs.c fixedname.c forward.c gen-unix.h gen-win32.h gen.
CVS commit: src/external/mpl/dhcp/dist/common
Module Name:src
Committed By: christos
Date: Wed Jan 13 17:01:31 UTC 2021
Modified Files:
src/external/mpl/dhcp/dist/common: options.c
Log Message:
Reset options on every loop.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/dist/common/options.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/dist/common/options.c
diff -u src/external/mpl/dhcp/dist/common/options.c:1.4 src/external/mpl/dhcp/dist/common/options.c:1.5
--- src/external/mpl/dhcp/dist/common/options.c:1.4 Wed Jan 13 10:51:49 2021
+++ src/external/mpl/dhcp/dist/common/options.c Wed Jan 13 12:01:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.4 2021/01/13 15:51:49 christos Exp $ */
+/* $NetBSD: options.c,v 1.5 2021/01/13 17:01:31 christos Exp $ */
/* options.c
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: options.c,v 1.4 2021/01/13 15:51:49 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.5 2021/01/13 17:01:31 christos Exp $");
#define DHCP_OPTION_DATA
#include "dhcpd.h"
@@ -130,8 +130,8 @@ int parse_option_buffer (options, buffer
unsigned len, offset;
unsigned code;
struct option_cache *op = NULL, *nop = NULL;
- struct buffer *bp = (struct buffer *)0;
- struct option *option = NULL;
+ struct buffer *bp = NULL;
+ struct option *option;
char *reason = "general failure";
if (!buffer_allocate (&bp, length, MDL)) {
@@ -143,6 +143,7 @@ int parse_option_buffer (options, buffer
for (offset = 0;
(offset + universe->tag_size) <= length &&
(code = universe->get_tag(buffer + offset)) != universe->end; ) {
+ option = NULL;
offset += universe->tag_size;
/* Pad options don't have a length - just skip them. */
CVS commit: src/external/mpl/dhcp/dist/common
Module Name:src
Committed By: christos
Date: Wed Jan 13 15:51:49 UTC 2021
Modified Files:
src/external/mpl/dhcp/dist/common: options.c
Log Message:
If an option is not found in the standard table, log it and don't try to
dereference it. This prevents crashes from XenServer VM that PXE boots and
includes option 175 in the DHCP request. Reported by Stephen Borrill.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/common/options.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/dist/common/options.c
diff -u src/external/mpl/dhcp/dist/common/options.c:1.3 src/external/mpl/dhcp/dist/common/options.c:1.4
--- src/external/mpl/dhcp/dist/common/options.c:1.3 Mon Aug 3 17:10:56 2020
+++ src/external/mpl/dhcp/dist/common/options.c Wed Jan 13 10:51:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.3 2020/08/03 21:10:56 christos Exp $ */
+/* $NetBSD: options.c,v 1.4 2021/01/13 15:51:49 christos Exp $ */
/* options.c
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: options.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.4 2021/01/13 15:51:49 christos Exp $");
#define DHCP_OPTION_DATA
#include "dhcpd.h"
@@ -179,13 +179,16 @@ int parse_option_buffer (options, buffer
offset += universe->length_size;
- option_code_hash_lookup(&option, universe->code_hash, &code,
- 0, MDL);
+ if (!option_code_hash_lookup(&option, universe->code_hash,
+ &code, 0, MDL)) {
+ log_error("Can't find option with code %u", code);
+ }
/* If the length is outrageous, the options are bad. */
if (offset + len > length) {
/* Avoid reference count overflow */
- option_dereference(&option, MDL);
+ if (option)
+option_dereference(&option, MDL);
reason = "option length exceeds option buffer length";
bogus:
log_error("parse_option_buffer: malformed option "
@@ -216,7 +219,8 @@ int parse_option_buffer (options, buffer
/* non-compliant clients can send it
* we'll just drop it and go on */
log_debug ("Ignoring empty DHO_HOST_NAME option");
- option_dereference(&option, MDL);
+ if (option)
+option_dereference(&option, MDL);
offset += len;
continue;
}
@@ -282,7 +286,8 @@ int parse_option_buffer (options, buffer
option_cache_dereference(&nop, MDL);
}
- option_dereference(&option, MDL);
+ if (option)
+ option_dereference(&option, MDL);
offset += len;
}
buffer_dereference (&bp, MDL);
CVS commit: src/external/mpl/dhcp/dist/omapip
Module Name:src
Committed By: christos
Date: Thu Nov 12 22:11:03 UTC 2020
Modified Files:
src/external/mpl/dhcp/dist/omapip: errwarn.c
Log Message:
Don't use static buffers to store format strings; this is a multi-threaded
program and if we print from multiple threads we can end up overwriting the
formats while printf is formating and that can end up in tears.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/omapip/errwarn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/dist/omapip/errwarn.c
diff -u src/external/mpl/dhcp/dist/omapip/errwarn.c:1.3 src/external/mpl/dhcp/dist/omapip/errwarn.c:1.4
--- src/external/mpl/dhcp/dist/omapip/errwarn.c:1.3 Mon Aug 3 17:10:57 2020
+++ src/external/mpl/dhcp/dist/omapip/errwarn.c Thu Nov 12 17:11:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: errwarn.c,v 1.3 2020/08/03 21:10:57 christos Exp $ */
+/* $NetBSD: errwarn.c,v 1.4 2020/11/12 22:11:03 christos Exp $ */
/* errwarn.c
@@ -34,7 +34,7 @@
*/
#include
-__RCSID("$NetBSD: errwarn.c,v 1.3 2020/08/03 21:10:57 christos Exp $");
+__RCSID("$NetBSD: errwarn.c,v 1.4 2020/11/12 22:11:03 christos Exp $");
#include "dhcpd.h"
@@ -50,14 +50,14 @@ int log_perror = 1;
void (*log_cleanup) (void);
#define CVT_BUF_MAX 1023
-static char mbuf [CVT_BUF_MAX + 1];
-static char fbuf [CVT_BUF_MAX + 1];
/* Log an error message, then exit... */
void log_fatal (const char * fmt, ... )
{
va_list list;
+ char mbuf [CVT_BUF_MAX + 1];
+ char fbuf [CVT_BUF_MAX + 1];
do_percentm (fbuf, sizeof fbuf, fmt);
@@ -96,6 +96,8 @@ void log_fatal (const char * fmt, ... )
int log_error (const char * fmt, ...)
{
+ char mbuf [CVT_BUF_MAX + 1];
+ char fbuf [CVT_BUF_MAX + 1];
va_list list;
do_percentm (fbuf, sizeof fbuf, fmt);
@@ -123,6 +125,8 @@ int log_error (const char * fmt, ...)
int log_info (const char *fmt, ...)
{
+ char mbuf [CVT_BUF_MAX + 1];
+ char fbuf [CVT_BUF_MAX + 1];
va_list list;
do_percentm (fbuf, sizeof fbuf, fmt);
@@ -150,6 +154,8 @@ int log_info (const char *fmt, ...)
int log_debug (const char *fmt, ...)
{
+ char mbuf [CVT_BUF_MAX + 1];
+ char fbuf [CVT_BUF_MAX + 1];
va_list list;
do_percentm (fbuf, sizeof fbuf, fmt);
CVS commit: src/external/mpl/bind/dist/lib/isc/unix
Module Name:src
Committed By: christos
Date: Sat Aug 29 16:07:11 UTC 2020
Modified Files:
src/external/mpl/bind/dist/lib/isc/unix: socket.c
Log Message:
Locking protocol changed again, unlock after send/recv
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/mpl/bind/dist/lib/isc/unix/socket.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/unix/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.17 src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.18
--- src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.17 Mon Aug 3 13:23:43 2020
+++ src/external/mpl/bind/dist/lib/isc/unix/socket.c Sat Aug 29 12:07:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.17 2020/08/03 17:23:43 christos Exp $ */
+/* $NetBSD: socket.c,v 1.18 2020/08/29 16:07:11 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -3201,6 +3201,8 @@ internal_fdwatch_write(isc__socket_t *so
if (more_data)
select_poke(sock->manager, sock->threadid, sock->fd,
SELECT_POKE_WRITE);
+
+ UNLOCK(&sock->lock);
}
static void
@@ -3227,6 +3229,8 @@ internal_fdwatch_read(isc__socket_t *soc
if (more_data)
select_poke(sock->manager, sock->threadid, sock->fd,
SELECT_POKE_READ);
+
+ UNLOCK(&sock->lock);
}
/*
CVS commit: src/external/mpl/dhcp/bin/server
Module Name:src
Committed By: fox
Date: Sun Jun 7 23:29:16 UTC 2020
Modified Files:
src/external/mpl/dhcp/bin/server: Makefile
Log Message:
external/mpl/dhcp: Suppress -Werror=stringop-truncation error
This logic correctly uses strncpy(3) to fully initialize a fixed-width field,
and also ensures
NUL-termination on the next line as other users of the field expect.
Add -Werror=stringop-truncation to prevent build failure, when run with
MKSANITIZER=yes.
Error was reported when build.sh was run with MKSANITIZER=yes flag.
Reviewed by: kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/dhcp/bin/server/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/dhcp/bin/server/Makefile
diff -u src/external/mpl/dhcp/bin/server/Makefile:1.5 src/external/mpl/dhcp/bin/server/Makefile:1.6
--- src/external/mpl/dhcp/bin/server/Makefile:1.5 Sat May 23 00:32:42 2020
+++ src/external/mpl/dhcp/bin/server/Makefile Sun Jun 7 23:29:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/05/23 00:32:42 rin Exp $
+# $NetBSD: Makefile,v 1.6 2020/06/07 23:29:16 fox Exp $
.include
@@ -21,5 +21,6 @@ COPTS.ddns.c +=-Wno-stringop-overflow
COPTS.mdb6.c += ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
COPTS.omapi.c += -Wno-stack-protector
+COPTS.confpars.c+= ${GCC_NO_STRINGOP_TRUNCATION}
.include
CVS commit: src/external/mpl/bind/lib/libisc
Module Name:src
Committed By: christos
Date: Wed Jun 3 02:07:53 UTC 2020
Modified Files:
src/external/mpl/bind/lib/libisc: Makefile
Log Message:
Fix the vax build: vax is special and always builds pic code.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 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.12 src/external/mpl/bind/lib/libisc/Makefile:1.13
--- src/external/mpl/bind/lib/libisc/Makefile:1.12 Sat May 30 16:47:59 2020
+++ src/external/mpl/bind/lib/libisc/Makefile Tue Jun 2 22:07:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/05/30 20:47:59 christos Exp $
+# $NetBSD: Makefile,v 1.13 2020/06/03 02:07:52 christos Exp $
LIB=isc
#USE_SHLIBDIR= yes
@@ -54,8 +54,13 @@ SRCS+= ipv6.c
LDFLAGS+=-Wl,--version-script=${.CURDIR}/isc.map
LDADD+=-Wl,-Bstatic
+.if ${MKPICLIB} != "no"
LDADD+=-L${LIBUVOBJDIR} -luv_pic
DPADD+=${LIBUVOBJDIR}/libuv_pic.a
+.else
+LDADD+=-L${LIBUVOBJDIR} -luv
+DPADD+=${LIBUVOBJDIR}/libuv.a
+.endif
LDADD+=-Wl,-Bdynamic
CVS commit: src/external/mpl/bind/dist/lib/isc/unix
Module Name:src
Committed By: christos
Date: Mon Jun 1 18:55:37 UTC 2020
Modified Files:
src/external/mpl/bind/dist/lib/isc/unix: socket.c
Log Message:
Locking protocol changed; the internal routines are now called with the
socket locked. Adjust for that.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/mpl/bind/dist/lib/isc/unix/socket.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/unix/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.15 src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.16
--- src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.15 Sun May 31 13:45:02 2020
+++ src/external/mpl/bind/dist/lib/isc/unix/socket.c Mon Jun 1 14:55:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.15 2020/05/31 17:45:02 christos Exp $ */
+/* $NetBSD: socket.c,v 1.16 2020/06/01 18:55:37 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -3174,7 +3174,6 @@ internal_fdwatch_write(isc__socket_t *so
INSIST(VALID_SOCKET(sock));
- LOCK(&sock->lock);
isc_refcount_increment(&sock->references);
UNLOCK(&sock->lock);
@@ -3192,8 +3191,6 @@ internal_fdwatch_write(isc__socket_t *so
if (more_data)
select_poke(sock->manager, sock->threadid, sock->fd,
SELECT_POKE_WRITE);
-
- UNLOCK(&sock->lock);
}
static void
@@ -3203,7 +3200,6 @@ internal_fdwatch_read(isc__socket_t *soc
INSIST(VALID_SOCKET(sock));
- LOCK(&sock->lock);
isc_refcount_increment(&sock->references);
UNLOCK(&sock->lock);
@@ -3221,8 +3217,6 @@ internal_fdwatch_read(isc__socket_t *soc
if (more_data)
select_poke(sock->manager, sock->threadid, sock->fd,
SELECT_POKE_READ);
-
- UNLOCK(&sock->lock);
}
/*
CVS commit: src/external/mpl/bind/dist/lib/isc/unix
Module Name:src
Committed By: christos
Date: Sun May 31 17:45:02 UTC 2020
Modified Files:
src/external/mpl/bind/dist/lib/isc/unix: socket.c
Log Message:
sync with regular socket code (no effect)
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/mpl/bind/dist/lib/isc/unix/socket.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/unix/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.14 src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.15
--- src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.14 Sun May 24 15:46:27 2020
+++ src/external/mpl/bind/dist/lib/isc/unix/socket.c Sun May 31 13:45:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.14 2020/05/24 19:46:27 christos Exp $ */
+/* $NetBSD: socket.c,v 1.15 2020/05/31 17:45:02 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -5739,13 +5739,17 @@ isc_socket_fdwatchcreate(isc_socketmgr_t
#if defined(USE_EPOLL)
manager->epoll_events[sock->fd] = 0;
#endif
+#ifdef USE_DEVPOLL
+ INSIST(thread->fdpollinfo[sock->fd].want_read == 0 &&
+ thread->fdpollinfo[sock->fd].want_write == 0);
+#endif /* ifdef USE_DEVPOLL */
UNLOCK(&thread->fdlock[lockid]);
LOCK(&manager->lock);
ISC_LIST_APPEND(manager->socklist, sock, link);
#ifdef USE_SELECT
- if (manager->maxfd < sock->fd)
- manager->maxfd = sock->fd;
+ if (thread->maxfd < sock->fd)
+ thread->maxfd = sock->fd;
#endif
UNLOCK(&manager->lock);
CVS commit: src/external/mpl/dhcp
Module Name:src
Committed By: christos
Date: Mon May 25 15:37:51 UTC 2020
Modified Files:
src/external/mpl/dhcp: Makefile.inc
Log Message:
Fix static build
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/dhcp/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/dhcp/Makefile.inc
diff -u src/external/mpl/dhcp/Makefile.inc:1.6 src/external/mpl/dhcp/Makefile.inc:1.7
--- src/external/mpl/dhcp/Makefile.inc:1.6 Sun May 24 15:50:12 2020
+++ src/external/mpl/dhcp/Makefile.inc Mon May 25 11:37:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2020/05/24 19:50:12 christos Exp $
+# $NetBSD: Makefile.inc,v 1.7 2020/05/25 15:37:50 christos Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -37,8 +37,8 @@ LDADD+= ${OMOBJDIR}/libomapi.a
# would be to install the libraries in /lib...
LDADD+=-Wl,-Bstatic
.endif
-LDADD+= -lirs -lisccfg -ldns -lisc -luv
-DPADD+= ${LIBIRS} ${LIBISCCFG} ${LIBDNS} ${LIBISC} ${LIBUV}
+LDADD+= -lirs -lisccfg -ldns -lisc -luv -lkvm
+DPADD+= ${LIBIRS} ${LIBISCCFG} ${LIBDNS} ${LIBISC} ${LIBUV} ${LIBKVM}
LDADD+= -lpthread -lz
DPADD+= ${LIBPTHREAD} ${LIBZ}
.if (${MKKERBEROS} != "no")
CVS commit: src/external/mpl/bind/dist/lib/dns
Module Name:src
Committed By: christos
Date: Mon May 25 15:14:04 UTC 2020
Modified Files:
src/external/mpl/bind/dist/lib/dns: zone.c
src/external/mpl/bind/dist/lib/dns/include/dns: zone.h
Log Message:
Pointless to force use of 64 bit atomics on flags fields that fit in 32 bits.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/dns/zone.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/mpl/bind/dist/lib/dns/include/dns/zone.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/zone.c
diff -u src/external/mpl/bind/dist/lib/dns/zone.c:1.9 src/external/mpl/bind/dist/lib/dns/zone.c:1.10
--- src/external/mpl/bind/dist/lib/dns/zone.c:1.9 Sun May 24 15:46:23 2020
+++ src/external/mpl/bind/dist/lib/dns/zone.c Mon May 25 11:14:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: zone.c,v 1.9 2020/05/24 19:46:23 christos Exp $ */
+/* $NetBSD: zone.c,v 1.10 2020/05/25 15:14:04 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -226,8 +226,13 @@ struct dns_zone {
int32_t journalsize;
dns_rdataclass_t rdclass;
dns_zonetype_t type;
+#ifdef __NetBSD__
+ atomic_uint_fast32_t flags;
+ atomic_uint_fast32_t options;
+#else
atomic_uint_fast64_t flags;
atomic_uint_fast64_t options;
+#endif
unsigned int db_argc;
char **db_argv;
isc_time_t expiretime;
@@ -372,7 +377,11 @@ struct dns_zone {
/*%
* Autosigning/key-maintenance options
*/
+#ifdef __NetBSD__
+ atomic_uint_fast32_t keyopts;
+#else
atomic_uint_fast64_t keyopts;
+#endif
/*%
* True if added by "rndc addzone"
@@ -501,7 +510,9 @@ typedef enum {
* notify due to the zone
* just being loaded for
* the first time. */
+#ifndef __NetBSD__
DNS_ZONEFLG___MAX = UINT64_MAX, /* trick to make the ENUM 64-bit wide */
+#endif
} dns_zoneflg_t;
#define DNS_ZONE_OPTION(z, o) ((atomic_load_relaxed(&(z)->options) & (o)) != 0)
Index: src/external/mpl/bind/dist/lib/dns/include/dns/zone.h
diff -u src/external/mpl/bind/dist/lib/dns/include/dns/zone.h:1.5 src/external/mpl/bind/dist/lib/dns/include/dns/zone.h:1.6
--- src/external/mpl/bind/dist/lib/dns/include/dns/zone.h:1.5 Sun May 24 15:46:23 2020
+++ src/external/mpl/bind/dist/lib/dns/include/dns/zone.h Mon May 25 11:14:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: zone.h,v 1.5 2020/05/24 19:46:23 christos Exp $ */
+/* $NetBSD: zone.h,v 1.6 2020/05/25 15:14:04 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -89,7 +89,9 @@ typedef enum {
DNS_ZONEOPT_CHECKSPF = 1 << 27, /*%< check SPF records */
DNS_ZONEOPT_CHECKTTL = 1 << 28, /*%< check max-zone-ttl */
DNS_ZONEOPT_AUTOEMPTY = 1 << 29, /*%< automatic empty zone */
+#ifndef __NetBSD__
DNS_ZONEOPT___MAX = UINT64_MAX, /* trick to make the ENUM 64-bit wide */
+#endif
} dns_zoneopt_t;
/*
@@ -101,7 +103,9 @@ typedef enum {
DNS_ZONEKEY_CREATE = 0x0004U, /*%< make keys when needed */
DNS_ZONEKEY_FULLSIGN = 0x0008U, /*%< roll to new keys immediately */
DNS_ZONEKEY_NORESIGN = 0x0010U, /*%< no automatic resigning */
+#ifndef __NetBSD__
DNS_ZONEKEY___MAX = UINT64_MAX, /* trick to make the ENUM 64-bit wide */
+#endif
} dns_zonekey_t;
#ifndef DNS_ZONE_MINREFRESH
CVS commit: src/external/mpl/bind/dist/lib/ns
Module Name:src
Committed By: christos
Date: Mon May 25 15:13:25 UTC 2020
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 stats counters to be 32 bits on ILP32
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/ns/client.c
cvs rdiff -u -r1.8 -r1.9 \
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.9 src/external/mpl/bind/dist/lib/ns/client.c:1.10
--- src/external/mpl/bind/dist/lib/ns/client.c:1.9 Sun May 24 15:46:29 2020
+++ src/external/mpl/bind/dist/lib/ns/client.c Mon May 25 11:13:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: client.c,v 1.9 2020/05/24 19:46:29 christos Exp $ */
+/* $NetBSD: client.c,v 1.10 2020/05/25 15:13:25 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -128,7 +128,7 @@
* Number of tasks to be used by clients - those are used only when recursing
*/
-#if defined(_WIN32) && !defined(_WIN64)
+#if (defined(_WIN32) && !defined(_WIN64)) || !defined(_LP64)
LIBNS_EXTERNAL_DATA atomic_uint_fast32_t ns_client_requests;
#else /* if defined(_WIN32) && !defined(_WIN64) */
LIBNS_EXTERNAL_DATA atomic_uint_fast64_t ns_client_requests;
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.8 src/external/mpl/bind/dist/lib/ns/include/ns/client.h:1.9
--- src/external/mpl/bind/dist/lib/ns/include/ns/client.h:1.8 Sun May 24 15:46:29 2020
+++ src/external/mpl/bind/dist/lib/ns/include/ns/client.h Mon May 25 11:13:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: client.h,v 1.8 2020/05/24 19:46:29 christos Exp $ */
+/* $NetBSD: client.h,v 1.9 2020/05/25 15:13:25 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -273,7 +273,7 @@ struct ns_client {
*/
#define NS_FAILCACHE_CD 0x01
-#if defined(_WIN32) && !defined(_WIN64)
+#if (defined(_WIN32) && !defined(_WIN64)) || !defined(_LP64)
LIBNS_EXTERNAL_DATA extern atomic_uint_fast32_t ns_client_requests;
#else /* if defined(_WIN32) && !defined(_WIN64) */
LIBNS_EXTERNAL_DATA extern atomic_uint_fast64_t ns_client_requests;
CVS commit: src/external/mpl/bind
Module Name:src
Committed By: christos
Date: Mon May 25 15:12:54 UTC 2020
Modified Files:
src/external/mpl/bind: Makefile.inc
Log Message:
Fix static linking.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/external/mpl/bind/Makefile.inc:1.7
--- src/external/mpl/bind/Makefile.inc:1.6 Sun May 24 15:46:10 2020
+++ src/external/mpl/bind/Makefile.inc Mon May 25 11:12:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2020/05/24 19:46:10 christos Exp $
+# $NetBSD: Makefile.inc,v 1.7 2020/05/25 15:12:54 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -66,12 +66,13 @@ DBG=-g3 -gstabs
.if !defined(LIB) || empty(LIB)
# NOTE: the order of these libraries is important...
.if defined(NAMED_DEBUG)
-LDADD+= -lbind9_g -lisccfg_g -ldns_g -lns_g -lirs_g -lisccc_g -lisc_g -lz_g
+LDADD+= -lbind9_g -lisccfg_g -ldns_g -lns_g -lirs_g
+LDADD+= -lisccc_g -lisc_g -luv_g -lkvm_g -lz_g
.else
LDADD+= -lbind9 -lisccfg -ldns -lns -lirs
DPADD+= ${LIBBIND9} ${LIBISCCFG} ${LIBDNS} ${LIBNS} ${LIBIRS}
-LDADD+= -lisccc -lisc -luv -lz
-DPADD+= ${LIBISCCC} ${LIBISC} ${LIBUV} ${LIBZ}
+LDADD+= -lisccc -lisc -luv -lkvm -lz
+DPADD+= ${LIBISCCC} ${LIBISC} ${LIBUV} ${LIBKVM} ${LIBZ}
.endif
.else
CPPFLAGS+= -DLIBINTERFACE=${LIBINTERFACE} \
CVS commit: src/external/mpl/dhcp
Module Name:src
Committed By: christos
Date: Sun May 24 19:50:12 UTC 2020
Modified Files:
src/external/mpl/dhcp: Makefile.inc
src/external/mpl/dhcp/dist/omapip: isclib.c
Log Message:
Adjust for bind-9.16.3
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/dhcp/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/omapip/isclib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/Makefile.inc
diff -u src/external/mpl/dhcp/Makefile.inc:1.5 src/external/mpl/dhcp/Makefile.inc:1.6
--- src/external/mpl/dhcp/Makefile.inc:1.5 Thu Jan 10 12:41:47 2019
+++ src/external/mpl/dhcp/Makefile.inc Sun May 24 15:50:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2019/01/10 17:41:47 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2020/05/24 19:50:12 christos Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -37,8 +37,10 @@ LDADD+= ${OMOBJDIR}/libomapi.a
# would be to install the libraries in /lib...
LDADD+=-Wl,-Bstatic
.endif
-LDADD+= -lirs -lisccfg -ldns -lisc
-LDADD+=-lpthread -lz
+LDADD+= -lirs -lisccfg -ldns -lisc -luv
+DPADD+= ${LIBIRS} ${LIBISCCFG} ${LIBDNS} ${LIBISC} ${LIBUV}
+LDADD+= -lpthread -lz
+DPADD+= ${LIBPTHREAD} ${LIBZ}
.if (${MKKERBEROS} != "no")
LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD} ${LIBKRB5_STATIC_LDADD}
DPADD+= ${LIBKRB5_DPADD} ${LIBHEIMNTLM} ${LIBGSSAPI} ${LIBKRB5_STATIC_DPADD}
@@ -53,5 +55,3 @@ LDADD+=-Wl,-Bdynamic
.endif
DPADD+= ${COBJDIR}/libdhcp.a
DPADD+= ${OMOBJDIR}/libomapi.a
-DPADD+= ${LIBDNS} ${LIBISC}
-DPADD+= ${LIBPTHREAD} ${LIBZ}
Index: src/external/mpl/dhcp/dist/omapip/isclib.c
diff -u src/external/mpl/dhcp/dist/omapip/isclib.c:1.3 src/external/mpl/dhcp/dist/omapip/isclib.c:1.4
--- src/external/mpl/dhcp/dist/omapip/isclib.c:1.3 Thu Jan 10 12:41:47 2019
+++ src/external/mpl/dhcp/dist/omapip/isclib.c Sun May 24 15:50:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: isclib.c,v 1.3 2019/01/10 17:41:47 christos Exp $ */
+/* $NetBSD: isclib.c,v 1.4 2020/05/24 19:50:12 christos Exp $ */
/*
* Copyright(c) 2009-2017 by Internet Systems Consortium, Inc.("ISC")
@@ -24,7 +24,7 @@
*/
#include
-__RCSID("$NetBSD: isclib.c,v 1.3 2019/01/10 17:41:47 christos Exp $");
+__RCSID("$NetBSD: isclib.c,v 1.4 2020/05/24 19:50:12 christos Exp $");
/*Trying to figure out what we need to define to get things to work.
It looks like we want/need the library but need the fdwatchcommand
@@ -169,10 +169,7 @@ dhcp_context_create(int flags,
* the lib inits in case we aren't doing NSUPDATE
* in which case dst needs a memory context
*/
- result = isc_mem_create(0, 0, &dhcp_gbl_ctx.mctx);
- if (result != ISC_R_SUCCESS)
- goto cleanup;
-
+ isc_mem_create(&dhcp_gbl_ctx.mctx);
#if defined (NSUPDATE)
result = dns_lib_init();
@@ -193,20 +190,17 @@ dhcp_context_create(int flags,
goto cleanup;
result = isc_taskmgr_createinctx(dhcp_gbl_ctx.mctx,
- dhcp_gbl_ctx.actx,
1, 0,
&dhcp_gbl_ctx.taskmgr);
if (result != ISC_R_SUCCESS)
goto cleanup;
result = isc_socketmgr_createinctx(dhcp_gbl_ctx.mctx,
- dhcp_gbl_ctx.actx,
&dhcp_gbl_ctx.socketmgr);
if (result != ISC_R_SUCCESS)
goto cleanup;
result = isc_timermgr_createinctx(dhcp_gbl_ctx.mctx,
- dhcp_gbl_ctx.actx,
&dhcp_gbl_ctx.timermgr);
if (result != ISC_R_SUCCESS)
goto cleanup;
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Sun May 24 19:46:31 UTC 2020 Modified Files: src/external/mpl/bind: Makefile.inc bind2netbsd 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.8 named-checkconf.c named-checkzone.8 named-checkzone.c src/external/mpl/bind/dist/bin/confgen: ddns-confgen.8 ddns-confgen.c keygen.c keygen.h rndc-confgen.8 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.1 delv.c src/external/mpl/bind/dist/bin/dig: dig.1 dig.c dighost.c host.1 host.c nslookup.1 nslookup.c src/external/mpl/bind/dist/bin/dig/include/dig: dig.h src/external/mpl/bind/dist/bin/dnssec: dnssec-cds.8 dnssec-cds.c dnssec-dsfromkey.8 dnssec-dsfromkey.c dnssec-importkey.8 dnssec-importkey.c dnssec-keyfromlabel.8 dnssec-keyfromlabel.c dnssec-keygen.8 dnssec-keygen.c dnssec-revoke.8 dnssec-revoke.c dnssec-settime.8 dnssec-settime.c dnssec-signzone.8 dnssec-signzone.c dnssec-verify.8 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 named.8 named.conf.5 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 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/win32: dlz_dlopen_driver.c ntservice.c os.c src/external/mpl/bind/dist/bin/named/win32/include/named: ntservice.h src/external/mpl/bind/dist/bin/nsupdate: nsupdate.1 nsupdate.c src/external/mpl/bind/dist/bin/pkcs11: pkcs11-destroy.8 pkcs11-destroy.c pkcs11-keygen.8 pkcs11-keygen.c pkcs11-list.8 pkcs11-list.c pkcs11-tokens.8 pkcs11-tokens.c src/external/mpl/bind/dist/bin/plugins: filter-.8 filter-.c src/external/mpl/bind/dist/bin/python: dnssec-checkds.8 dnssec-coverage.8 dnssec-keymgr.8 src/external/mpl/bind/dist/bin/rndc: rndc.8 rndc.c rndc.conf.5 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 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 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.1 arpaname.c dnstap-read.1 dnstap-read.c mdig.1 mdig.c named-journalprint.8 named-journalprint.c named-nzd2nzf.8 named-nzd2nzf.c named-rrchecker.1 named-rrchecker.c nsec3hash.8 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
CVS commit: src/external/mpl/dhcp/bin/server
Module Name:src
Committed By: rin
Date: Sat May 23 00:32:42 UTC 2020
Modified Files:
src/external/mpl/dhcp/bin/server: Makefile
Log Message:
GCC8 needs -Wno-stringop-overflow also for m68000 (sun2).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/bin/server/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/dhcp/bin/server/Makefile
diff -u src/external/mpl/dhcp/bin/server/Makefile:1.4 src/external/mpl/dhcp/bin/server/Makefile:1.5
--- src/external/mpl/dhcp/bin/server/Makefile:1.4 Wed Feb 12 00:41:50 2020
+++ src/external/mpl/dhcp/bin/server/Makefile Sat May 23 00:32:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/02/12 00:41:50 fox Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/23 00:32:42 rin Exp $
.include
@@ -15,7 +15,7 @@ FILESDIR= /usr/share/examples/dhcp
FILES= dhcpd.conf
.endif
-.if !empty(MACHINE_ARCH:Msh3*)
+.if !empty(MACHINE_ARCH:Msh3*) || ${MACHINE_ARCH} == "m68000"
COPTS.ddns.c +=-Wno-stringop-overflow
.endif
CVS commit: src/external/mpl/dhcp/dist/common
Module Name:src
Committed By: manu
Date: Fri May 15 12:31:04 UTC 2020
Modified Files:
src/external/mpl/dhcp/dist/common: bpf.c discover.c lpf.c packet.c
raw.c socket.c
Log Message:
crunchgen fix
Make sure local_port is not shared within a crunchgen binary. There is
more to do to get full functionnality in crunchgen, but at least this
change makes dhcpd listen on the right port again.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/common/bpf.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/common/discover.c \
src/external/mpl/dhcp/dist/common/lpf.c \
src/external/mpl/dhcp/dist/common/packet.c \
src/external/mpl/dhcp/dist/common/raw.c \
src/external/mpl/dhcp/dist/common/socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/dist/common/bpf.c
diff -u src/external/mpl/dhcp/dist/common/bpf.c:1.3 src/external/mpl/dhcp/dist/common/bpf.c:1.4
--- src/external/mpl/dhcp/dist/common/bpf.c:1.3 Fri Jun 1 00:42:49 2018
+++ src/external/mpl/dhcp/dist/common/bpf.c Fri May 15 12:31:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.3 2018/06/01 00:42:49 christos Exp $ */
+/* $NetBSD: bpf.c,v 1.4 2020/05/15 12:31:03 manu Exp $ */
/* bpf.c
@@ -35,7 +35,7 @@
*/
#include
-__RCSID("$NetBSD: bpf.c,v 1.3 2018/06/01 00:42:49 christos Exp $");
+__RCSID("$NetBSD: bpf.c,v 1.4 2020/05/15 12:31:03 manu Exp $");
#include "dhcpd.h"
#if defined (USE_BPF_SEND) || defined (USE_BPF_RECEIVE) \
@@ -366,7 +366,7 @@ void if_register_receive (info)
dhcp_bpf_relay_filter [10].k = ntohs (relay_port);
}
#endif
- p.bf_insns [8].k = ntohs (local_port);
+ p.bf_insns [8].k = ntohs (*libdhcp_callbacks.local_port);
if (ioctl (info -> rfdesc, BIOCSETF, &p) < 0)
log_fatal ("Can't install packet filter program: %m");
Index: src/external/mpl/dhcp/dist/common/discover.c
diff -u src/external/mpl/dhcp/dist/common/discover.c:1.2 src/external/mpl/dhcp/dist/common/discover.c:1.3
--- src/external/mpl/dhcp/dist/common/discover.c:1.2 Sat Apr 7 22:37:29 2018
+++ src/external/mpl/dhcp/dist/common/discover.c Fri May 15 12:31:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: discover.c,v 1.2 2018/04/07 22:37:29 christos Exp $ */
+/* $NetBSD: discover.c,v 1.3 2020/05/15 12:31:03 manu Exp $ */
/* discover.c
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: discover.c,v 1.2 2018/04/07 22:37:29 christos Exp $");
+__RCSID("$NetBSD: discover.c,v 1.3 2020/05/15 12:31:03 manu Exp $");
#include "dhcpd.h"
@@ -47,8 +47,6 @@ __RCSID("$NetBSD: discover.c,v 1.2 2018/
struct interface_info *interfaces, *dummy_interfaces, *fallback_interface;
int interfaces_invalidated;
int quiet_interface_discovery;
-u_int16_t local_port;
-u_int16_t remote_port;
u_int16_t relay_port = 0;
int dhcpv4_over_dhcpv6 = 0;
int (*dhcp_interface_setup_hook) (struct interface_info *, struct iaddr *);
Index: src/external/mpl/dhcp/dist/common/lpf.c
diff -u src/external/mpl/dhcp/dist/common/lpf.c:1.2 src/external/mpl/dhcp/dist/common/lpf.c:1.3
--- src/external/mpl/dhcp/dist/common/lpf.c:1.2 Sat Apr 7 22:37:29 2018
+++ src/external/mpl/dhcp/dist/common/lpf.c Fri May 15 12:31:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lpf.c,v 1.2 2018/04/07 22:37:29 christos Exp $ */
+/* $NetBSD: lpf.c,v 1.3 2020/05/15 12:31:03 manu Exp $ */
/* lpf.c
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: lpf.c,v 1.2 2018/04/07 22:37:29 christos Exp $");
+__RCSID("$NetBSD: lpf.c,v 1.3 2020/05/15 12:31:03 manu Exp $");
#include "dhcpd.h"
#if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
@@ -278,7 +278,7 @@ static void lpf_gen_filter_setup (info)
dhcp_bpf_relay_filter [10].k = ntohs (relay_port);
}
#endif
- dhcp_bpf_filter [8].k = ntohs (local_port);
+ dhcp_bpf_filter [8].k = ntohs (*libdhcp_callbacks.local_port);
if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p,
sizeof p) < 0) {
Index: src/external/mpl/dhcp/dist/common/packet.c
diff -u src/external/mpl/dhcp/dist/common/packet.c:1.2 src/external/mpl/dhcp/dist/common/packet.c:1.3
--- src/external/mpl/dhcp/dist/common/packet.c:1.2 Sat Apr 7 22:37:29 2018
+++ src/external/mpl/dhcp/dist/common/packet.c Fri May 15 12:31:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: packet.c,v 1.2 2018/04/07 22:37:29 christos Exp $ */
+/* $NetBSD: packet.c,v 1.3 2020/05/15 12:31:03 manu Exp $ */
/* packet.c
@@ -34,7 +34,7 @@
*/
#include
-__RCSID("$NetBSD: packet.c,v 1.2 2018/04/07 22:37:29 christos Exp $");
+__RCSID("$NetBSD: packet.c,v 1.3 2020/05/15 12:31:03 manu Exp $");
#include "dhcpd.h"
@@ -308,10 +308,10 @@ decode_udp_ip_header(struct interface_in
/* Is it to the port we're serving? */
#if defined(RELAY_PORT)
- if ((udp.uh_dport != local_port) &&
+ if ((udp.uh_dport != *libdhcp_callbacks.local_port) &&
((relay_port == 0) || (udp.uh_dport != relay_port)))
#else
- if (udp.uh_dport != local_port)
+
CVS commit: src/external/mpl/dhcp/bin/server
Module Name:src
Committed By: fox
Date: Wed Feb 12 00:41:50 UTC 2020
Modified Files:
src/external/mpl/dhcp/bin/server: Makefile
Log Message:
external/mpl/dhcp: Fix build failure under LLVM.
-Wno-error= flag now only applies to gcc 8 and not to LLVM based builds.
Reviewed by: kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/bin/server/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/dhcp/bin/server/Makefile
diff -u src/external/mpl/dhcp/bin/server/Makefile:1.3 src/external/mpl/dhcp/bin/server/Makefile:1.4
--- src/external/mpl/dhcp/bin/server/Makefile:1.3 Sun Feb 9 07:59:44 2020
+++ src/external/mpl/dhcp/bin/server/Makefile Wed Feb 12 00:41:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/02/09 07:59:44 fox Exp $
+# $NetBSD: Makefile,v 1.4 2020/02/12 00:41:50 fox Exp $
.include
@@ -19,7 +19,7 @@ FILES= dhcpd.conf
COPTS.ddns.c +=-Wno-stringop-overflow
.endif
-COPTS.mdb6.c += -Wno-error=format-overflow
+COPTS.mdb6.c += ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
COPTS.omapi.c += -Wno-stack-protector
.include
CVS commit: src/external/mpl/dhcp/bin/server
Module Name:src Committed By: fox Date: Sun Feb 9 07:59:44 UTC 2020 Modified Files: src/external/mpl/dhcp/bin/server: Makefile Log Message: external/mpl/dhcp: Suppress -Werror=format-overflow error. Add -Wno-error=format-overflow mdb6.c to prevent build failure. Error was reported when build.sh was run with MKLIBCSANITIZER=yes flag. Reviewed by: kamil@ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/bin/server/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/dhcp/bin/server/Makefile diff -u src/external/mpl/dhcp/bin/server/Makefile:1.2 src/external/mpl/dhcp/bin/server/Makefile:1.3 --- src/external/mpl/dhcp/bin/server/Makefile:1.2 Wed Oct 30 00:25:00 2019 +++ src/external/mpl/dhcp/bin/server/Makefile Sun Feb 9 07:59:44 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/10/30 00:25:00 christos Exp $ +# $NetBSD: Makefile,v 1.3 2020/02/09 07:59:44 fox Exp $ .include @@ -19,6 +19,7 @@ FILES= dhcpd.conf COPTS.ddns.c +=-Wno-stringop-overflow .endif +COPTS.mdb6.c += -Wno-error=format-overflow COPTS.omapi.c += -Wno-stack-protector .include
CVS commit: src/external/mpl/bind/dist/lib/isc/unix
Module Name:src
Committed By: christos
Date: Sun Dec 29 01:38:27 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc/unix: app.c
Log Message:
Only ignore signals if we are bind (not dhcpd).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/unix/app.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/unix/app.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/app.c:1.4 src/external/mpl/bind/dist/lib/isc/unix/app.c:1.5
--- src/external/mpl/bind/dist/lib/isc/unix/app.c:1.4 Sun Feb 24 15:01:31 2019
+++ src/external/mpl/bind/dist/lib/isc/unix/app.c Sat Dec 28 20:38:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: app.c,v 1.4 2019/02/24 20:01:31 christos Exp $ */
+/* $NetBSD: app.c,v 1.5 2019/12/29 01:38:27 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -196,6 +196,7 @@ isc_app_ctxstart(isc_appctx_t *ctx0) {
goto cleanup;
#endif
+ if (isc_bind9) {
/*
* Block SIGHUP, SIGINT, SIGTERM.
*
@@ -224,6 +225,7 @@ isc_app_ctxstart(isc_appctx_t *ctx0) {
result = ISC_R_UNEXPECTED;
goto cleanup;
}
+ }
return (ISC_R_SUCCESS);
CVS commit: src/external/mpl/bind/dist/bin/named
Module Name:src
Committed By: taca
Date: Thu May 2 14:57:01 UTC 2019
Modified Files:
src/external/mpl/bind/dist/bin/named: server.c
Log Message:
Fix one more writable directory check to "directory" in options seciton
when named is reloaded case.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/named/server.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/named/server.c
diff -u src/external/mpl/bind/dist/bin/named/server.c:1.5 src/external/mpl/bind/dist/bin/named/server.c:1.6
--- src/external/mpl/bind/dist/bin/named/server.c:1.5 Sun Apr 28 00:01:13 2019
+++ src/external/mpl/bind/dist/bin/named/server.c Thu May 2 14:57:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.5 2019/04/28 00:01:13 christos Exp $ */
+/* $NetBSD: server.c,v 1.6 2019/05/02 14:57:01 taca Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -6466,6 +6466,7 @@ directory_callback(const char *clausenam
"option 'directory' contains relative path '%s'",
directory);
+#if 0
if (!isc_file_isdirwritable(directory)) {
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR,
@@ -6473,6 +6474,7 @@ directory_callback(const char *clausenam
directory);
return (ISC_R_NOPERM);
}
+#endif
result = isc_dir_chdir(directory);
if (result != ISC_R_SUCCESS) {
CVS commit: src/external/mpl/bind/dist/lib/isc/unix
Module Name:src
Committed By: christos
Date: Sun Mar 10 18:03:40 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc/unix: socket.c
Log Message:
shorten name, use snprintf
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/isc/unix/socket.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/unix/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.8 src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.9
--- src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.8 Sun Feb 24 15:01:32 2019
+++ src/external/mpl/bind/dist/lib/isc/unix/socket.c Sun Mar 10 14:03:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.8 2019/02/24 20:01:32 christos Exp $ */
+/* $NetBSD: socket.c,v 1.9 2019/03/10 18:03:40 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -3956,8 +3956,8 @@ isc_socketmgr_create2(isc_mem_t *mctx, i
&manager->threads[i],
&manager->threads[i].thread)
== ISC_R_SUCCESS);
- char tname[1024];
- sprintf(tname, "isc-socket-%d", i);
+ char tname[128];
+ snprintf(tname, sizeof(tname), "sock-%d", i);
isc_thread_setname(manager->threads[i].thread, tname);
}
CVS commit: src/external/mpl/bind
Module Name:src
Committed By: joerg
Date: Thu Feb 28 22:18:21 UTC 2019
Modified Files:
src/external/mpl/bind: Makefile.inc
src/external/mpl/bind/lib/libisc: Makefile
Log Message:
Disable warning about atomic alignment for all bind. It's used too
often.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 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/Makefile.inc
diff -u src/external/mpl/bind/Makefile.inc:1.3 src/external/mpl/bind/Makefile.inc:1.4
--- src/external/mpl/bind/Makefile.inc:1.3 Wed Jan 9 16:54:58 2019
+++ src/external/mpl/bind/Makefile.inc Thu Feb 28 22:18:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2019/01/09 16:54:58 christos Exp $
+# $NetBSD: Makefile.inc,v 1.4 2019/02/28 22:18:21 joerg Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -9,7 +9,8 @@ USE_FORT?= yes # network client/server
WARNS?= 1
-CWARNFLAGS.clang+= -Wno-unused-value -Wno-parentheses
+CWARNFLAGS.clang+= -Wno-unused-value -Wno-parentheses \
+ -Wno-atomic-alignment
.include
Index: src/external/mpl/bind/lib/libisc/Makefile
diff -u src/external/mpl/bind/lib/libisc/Makefile:1.7 src/external/mpl/bind/lib/libisc/Makefile:1.8
--- src/external/mpl/bind/lib/libisc/Makefile:1.7 Thu Feb 28 17:40:06 2019
+++ src/external/mpl/bind/lib/libisc/Makefile Thu Feb 28 22:18:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/02/28 17:40:06 christos Exp $
+# $NetBSD: Makefile,v 1.8 2019/02/28 22:18:21 joerg Exp $
LIB=isc
#USE_SHLIBDIR= yes
@@ -36,21 +36,11 @@ SRCS= assertions.c base32.c base64.c bi
taskpool.c timer.c tm.c version.c \
${UNIX_SRCS} ${PTHREAD_SRCS} ${CRYPTO_SRCS}
-
-
.if (${USE_INET6} == "no")
CPPFLAGS.net.c= -Wno-error
SRCS+= ipv6.c
.endif
-# On certain flavors of arm we don't have native atomics only ones
-# libcall ones which are inefficient. But this should not be an
-# error anyway.
-COPTS.mem.c+= ${${ACTIVE_CC} == "clang":? -Wno-error-atomic-alignment :}
-COPTS.counter.c+= ${${ACTIVE_CC} == "clang":? -Wno-error-atomic-alignment :}
-
-
-
LDADD+=-lz
DPADD+=${LIBZ}
CVS commit: src/external/mpl/bind/lib/libisc
Module Name:src
Committed By: christos
Date: Thu Feb 28 17:40:06 UTC 2019
Modified Files:
src/external/mpl/bind/lib/libisc: Makefile
Log Message:
one more for the atomic references on clang.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/external/mpl/bind/lib/libisc/Makefile:1.7
--- src/external/mpl/bind/lib/libisc/Makefile:1.6 Sun Feb 24 15:01:33 2019
+++ src/external/mpl/bind/lib/libisc/Makefile Thu Feb 28 12:40:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/02/24 20:01:33 christos Exp $
+# $NetBSD: Makefile,v 1.7 2019/02/28 17:40:06 christos Exp $
LIB=isc
#USE_SHLIBDIR= yes
@@ -47,6 +47,7 @@ SRCS+= ipv6.c
# libcall ones which are inefficient. But this should not be an
# error anyway.
COPTS.mem.c+= ${${ACTIVE_CC} == "clang":? -Wno-error-atomic-alignment :}
+COPTS.counter.c+= ${${ACTIVE_CC} == "clang":? -Wno-error-atomic-alignment :}
CVS commit: src/external/mpl/dhcp/dist/omapip
Module Name:src
Committed By: christos
Date: Mon Feb 25 02:31:58 UTC 2019
Modified Files:
src/external/mpl/dhcp/dist/omapip: result.c
Log Message:
Catch up with bind
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/omapip/result.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/dist/omapip/result.c
diff -u src/external/mpl/dhcp/dist/omapip/result.c:1.2 src/external/mpl/dhcp/dist/omapip/result.c:1.3
--- src/external/mpl/dhcp/dist/omapip/result.c:1.2 Sat Apr 7 18:37:30 2018
+++ src/external/mpl/dhcp/dist/omapip/result.c Sun Feb 24 21:31:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: result.c,v 1.2 2018/04/07 22:37:30 christos Exp $ */
+/* $NetBSD: result.c,v 1.3 2019/02/25 02:31:57 christos Exp $ */
/* result.c
*/
@@ -28,7 +28,7 @@
*/
#include
-__RCSID("$NetBSD: result.c,v 1.2 2018/04/07 22:37:30 christos Exp $");
+__RCSID("$NetBSD: result.c,v 1.3 2019/02/25 02:31:57 christos Exp $");
#include "dhcpd.h"
@@ -77,15 +77,12 @@ static const char *text[DHCP_R_NRESULTS]
#define DHCP_RESULT_RESULTSET 2
#define DHCP_RESULT_UNAVAILABLESET 3
-// This is a placeholder as we don't allow for external message catalogs yet
-isc_msgcat_t * dhcp_msgcat = NULL;
-
isc_result_t
dhcp_result_register(void) {
isc_result_t result;
result = isc_result_register(ISC_RESULTCLASS_DHCP, DHCP_R_NRESULTS,
- text, dhcp_msgcat, DHCP_RESULT_RESULTSET);
+ text, DHCP_RESULT_RESULTSET);
return(result);
}
CVS commit: src/external/mpl/bind/lib/libisc
Module Name:src
Committed By: christos
Date: Wed Feb 20 03:50:06 UTC 2019
Modified Files:
src/external/mpl/bind/lib/libisc: Makefile
Log Message:
try using COPTS instead of CPPFLAGS
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/external/mpl/bind/lib/libisc/Makefile:1.5
--- src/external/mpl/bind/lib/libisc/Makefile:1.4 Mon Feb 18 14:30:18 2019
+++ src/external/mpl/bind/lib/libisc/Makefile Tue Feb 19 22:50:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/02/18 19:30:18 christos Exp $
+# $NetBSD: Makefile,v 1.5 2019/02/20 03:50:06 christos Exp $
LIB=isc
#USE_SHLIBDIR= yes
@@ -47,7 +47,7 @@ SRCS+= ipv6.c
# On certain flavors of arm we don't have native atomics only ones
# libcall ones which are inefficient. But this should not be an
# error anyway.
-CPPFLAGS.mem.c+= ${${ACTIVE_CC} == "clang":? -Wno-error-atomic-alignment :}
+COPTS.mem.c+= ${${ACTIVE_CC} == "clang":? -Wno-error-atomic-alignment :}
CVS commit: src/external/mpl/bind/lib/libisc
Module Name:src
Committed By: christos
Date: Mon Feb 18 19:30:18 UTC 2019
Modified Files:
src/external/mpl/bind/lib/libisc: Makefile
Log Message:
Avoid clang errors about atomics on arm
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 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.3 src/external/mpl/bind/lib/libisc/Makefile:1.4
--- src/external/mpl/bind/lib/libisc/Makefile:1.3 Wed Jan 9 11:55:23 2019
+++ src/external/mpl/bind/lib/libisc/Makefile Mon Feb 18 14:30:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/01/09 16:55:23 christos Exp $
+# $NetBSD: Makefile,v 1.4 2019/02/18 19:30:18 christos Exp $
LIB=isc
#USE_SHLIBDIR= yes
@@ -44,6 +44,13 @@ CPPFLAGS.net.c= -Wno-error
SRCS+= ipv6.c
.endif
+# On certain flavors of arm we don't have native atomics only ones
+# libcall ones which are inefficient. But this should not be an
+# error anyway.
+CPPFLAGS.mem.c+= ${${ACTIVE_CC} == "clang":? -Wno-error-atomic-alignment :}
+
+
+
LDADD+=-lz
DPADD+=${LIBZ}
CVS commit: src/external/mpl/bind/dist/lib/isc/unix
Module Name:src
Committed By: christos
Date: Wed Feb 13 01:16:30 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc/unix: socket.c
Log Message:
cleanup unused stuff now that we execute directly and not in a separate task.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/isc/unix/socket.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/unix/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.6 src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.7
--- src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.6 Mon Feb 11 21:38:55 2019
+++ src/external/mpl/bind/dist/lib/isc/unix/socket.c Tue Feb 12 20:16:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.6 2019/02/12 02:38:55 christos Exp $ */
+/* $NetBSD: socket.c,v 1.7 2019/02/13 01:16:30 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -351,14 +351,6 @@ struct isc__socket {
charname[16];
void *tag;
- /*
- * Internal events. Posted when a descriptor is readable or
- * writable. These are statically allocated and never freed.
- * They will be set to non-purgable before use.
- */
- intev_t readable_ev;
- intev_t writable_ev;
-
ISC_LIST(isc_socketevent_t) send_list;
ISC_LIST(isc_socketevent_t) recv_list;
ISC_LIST(isc_socket_newconnev_t) accept_list;
@@ -366,9 +358,7 @@ struct isc__socket {
isc_sockaddr_t peer_address; /* remote address */
- unsigned int pending_recv : 1,
-pending_send : 1,
-listener : 1, /* listener socket */
+ unsigned int listener : 1, /* listener socket */
connected : 1,
connecting : 1, /* connect pending */
bound : 1, /* bound to local addr */
@@ -380,10 +370,10 @@ struct isc__socket {
unsigned char overflow; /* used for MSG_TRUNC fake */
#endif
-void*fdwatcharg;
-isc_sockfdwatch_t fdwatchcb;
-int fdwatchflags;
-isc_task_t *fdwatchtask;
+ void *fdwatcharg;
+ isc_sockfdwatch_t fdwatchcb;
+ int fdwatchflags;
+ isc_task_t *fdwatchtask;
unsigned int dscp;
};
@@ -474,8 +464,8 @@ static void internal_accept(isc__socket_
static void internal_connect(isc__socket_t *);
static void internal_recv(isc__socket_t *);
static void internal_send(isc__socket_t *);
-static void internal_fdwatch_write(isc_task_t *, isc_event_t *);
-static void internal_fdwatch_read(isc_task_t *, isc_event_t *);
+static void internal_fdwatch_write(isc__socket_t *);
+static void internal_fdwatch_read(isc__socket_t *);
static void process_cmsg(isc__socket_t *, struct msghdr *, isc_socketevent_t *);
static void build_msghdr_send(isc__socket_t *, char *, isc_socketevent_t *,
struct msghdr *, struct iovec *, size_t *);
@@ -1962,8 +1952,6 @@ allocate_socket(isc__socketmgr_t *manage
ISC_LIST_INIT(sock->accept_list);
ISC_LIST_INIT(sock->connect_list);
sock->listener = 0;
- sock->pending_recv = 0;
- sock->pending_send = 0;
sock->connected = 0;
sock->connecting = 0;
sock->bound = 0;
@@ -1974,16 +1962,6 @@ allocate_socket(isc__socketmgr_t *manage
*/
isc_mutex_init(&sock->lock);
- /*
- * Initialize readable and writable events.
- */
- ISC_EVENT_INIT(&sock->readable_ev, sizeof(intev_t),
- ISC_EVENTATTR_NOPURGE, NULL, ISC_SOCKEVENT_INTR,
- NULL, sock, sock, NULL, NULL);
- ISC_EVENT_INIT(&sock->writable_ev, sizeof(intev_t),
- ISC_EVENTATTR_NOPURGE, NULL, ISC_SOCKEVENT_INTW,
- NULL, sock, sock, NULL, NULL);
-
sock->common.magic = ISCAPI_SOCKET_MAGIC;
sock->common.impmagic = SOCKET_MAGIC;
*socketp = sock;
@@ -2005,8 +1983,6 @@ free_socket(isc__socket_t **socketp) {
INSIST(VALID_SOCKET(sock));
INSIST(isc_refcount_current(&sock->references) == 0);
INSIST(!sock->connecting);
- INSIST(!sock->pending_recv);
- INSIST(!sock->pending_send);
INSIST(ISC_LIST_EMPTY(sock->recv_list));
INSIST(ISC_LIST_EMPTY(sock->send_list));
INSIST(ISC_LIST_EMPTY(sock->accept_list));
@@ -2820,8 +2796,6 @@ isc_socket_close(isc_socket_t *sock0) {
REQUIRE(sock->fd >= 0 && sock->fd < (int)sock->manager->maxsocks);
INSIST(!sock->connecting);
- INSIST(!sock->pending_recv);
- INSIST(!sock->pending_send);
INSIST(ISC_LIST_EMPTY(sock->recv_list));
INSIST(ISC_LIST_EMPTY(sock->send_list));
INSIST(ISC_LIST_EMPTY(sock->accept_list));
@@ -2849,64 +2823,22 @@ isc_socket_close(isc_socket_t *sock0) {
return (ISC_R_SUCCESS);
}
-/*
- * I/O is possible on a given socket. Schedule an event to this task that
- * will call an internal function to do the I/O. This will charge the
- * task with the I/O operation and let our select loop handler get back
- * to doing something real as fast as possible.
- *
- * The socket and manager must be locked before calling this function.
- */
stati
CVS commit: src/external/mpl/bind/dist/lib/isc/unix
Module Name:src
Committed By: christos
Date: Tue Feb 12 02:38:56 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc/unix: socket.c
Log Message:
Instead of queuing to a separate task, handle the fdwatch events inline.
Fixes locking. We could simplify the code a lot more now.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isc/unix/socket.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/unix/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.5 src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.6
--- src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.5 Sat Jan 26 20:51:00 2019
+++ src/external/mpl/bind/dist/lib/isc/unix/socket.c Mon Feb 11 21:38:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.5 2019/01/27 01:51:00 christos Exp $ */
+/* $NetBSD: socket.c,v 1.6 2019/02/12 02:38:55 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -2866,24 +2866,20 @@ dispatch_recv(isc__socket_t *sock) {
internal_recv(sock);
return;
}
-#if 0
+
+ LOCK(&sock->lock);
INSIST(!sock->pending_recv);
-#else
- // XXX: locking
- if (sock->pending_recv)
- return;
-#endif
sender = sock->fdwatchtask;
sock->pending_recv = 1;
iev = &sock->readable_ev;
- sock->references++;
+ isc_refcount_increment(&sock->references);
iev->ev_sender = sock;
iev->ev_action = internal_fdwatch_read;
iev->ev_arg = sock;
-
- isc_task_send(sender, (isc_event_t **)&iev);
+ UNLOCK(&sock->lock);
+ internal_fdwatch_read(sender, iev);
}
static void
@@ -2896,18 +2892,21 @@ dispatch_send(isc__socket_t *sock) {
return;
}
+ LOCK(&sock->lock);
+
INSIST(!sock->pending_send);
sender = sock->fdwatchtask;
sock->pending_send = 1;
iev = &sock->writable_ev;
- sock->references++;
+ isc_refcount_increment(&sock->references);
iev->ev_sender = sock;
iev->ev_action = internal_fdwatch_write;
iev->ev_arg = sock;
- isc_task_send(sender, (isc_event_t **)&iev);
+ UNLOCK(&sock->lock);
+ internal_fdwatch_write(sender, iev);
}
/*
@@ -3374,9 +3373,7 @@ internal_fdwatch_write(isc_task_t *me, i
sock->pending_send = 0;
- INSIST(sock->references > 0);
- sock->references--; /* the internal event is done with this socket */
- if (sock->references == 0) {
+ if (isc_refcount_decrement(&sock->references) == 0) {
UNLOCK(&sock->lock);
destroy(&sock);
return;
@@ -3408,16 +3405,14 @@ internal_fdwatch_read(isc_task_t *me, is
"internal_fdwatch_read: task %p got event %p", me, ev);
INSIST(sock->pending_recv == 1);
- sock->pending_recv = 0;
UNLOCK(&sock->lock);
more_data = (sock->fdwatchcb)(me, (isc_socket_t *)sock,
sock->fdwatcharg, ISC_SOCKFDWATCH_READ);
LOCK(&sock->lock);
- INSIST(sock->references > 0);
- sock->references--; /* the internal event is done with this socket */
- if (sock->references == 0) {
+ sock->pending_recv = 0;
+ if (isc_refcount_decrement(&sock->references) == 0) {
UNLOCK(&sock->lock);
destroy(&sock);
return;
CVS commit: src/external/mpl/dhcp/dist/bind
Module Name:src Committed By: christos Date: Fri Feb 8 20:29:06 UTC 2019 Removed Files: src/external/mpl/dhcp/dist/bind: Makefile.in bind.tar.gz version.tmp Log Message: Remove the copy of bind?!?! used for its libraries... To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/mpl/dhcp/dist/bind/Makefile.in \ src/external/mpl/dhcp/dist/bind/bind.tar.gz \ src/external/mpl/dhcp/dist/bind/version.tmp 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/tests
Module Name:src
Committed By: dholland
Date: Sun Jan 27 04:33:29 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc/tests: regex_test.c
Log Message:
fix duplicated chunk from merge
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mpl/bind/dist/lib/isc/tests/regex_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/lib/isc/tests/regex_test.c
diff -u src/external/mpl/bind/dist/lib/isc/tests/regex_test.c:1.4 src/external/mpl/bind/dist/lib/isc/tests/regex_test.c:1.5
--- src/external/mpl/bind/dist/lib/isc/tests/regex_test.c:1.4 Sun Jan 27 02:08:35 2019
+++ src/external/mpl/bind/dist/lib/isc/tests/regex_test.c Sun Jan 27 04:33:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: regex_test.c,v 1.4 2019/01/27 02:08:35 pgoyette Exp $ */
+/* $NetBSD: regex_test.c,v 1.5 2019/01/27 04:33:29 dholland Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1132,8 +1132,6 @@ regex_validate(void **state) {
}
assert_int_equal(r, tests[i].expect);
}
-
- return (cmocka_run_group_tests(tests, NULL, NULL));
}
int
CVS commit: src/external/mpl/dhcp/dist/omapip
Module Name:src
Committed By: christos
Date: Sun Jan 27 01:51:50 UTC 2019
Modified Files:
src/external/mpl/dhcp/dist/omapip: buffer.c dispatch.c
Log Message:
apparently the fdwatch crap is needed, so undo the ifdefs.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/omapip/buffer.c \
src/external/mpl/dhcp/dist/omapip/dispatch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/dist/omapip/buffer.c
diff -u src/external/mpl/dhcp/dist/omapip/buffer.c:1.3 src/external/mpl/dhcp/dist/omapip/buffer.c:1.4
--- src/external/mpl/dhcp/dist/omapip/buffer.c:1.3 Thu Jan 10 12:41:47 2019
+++ src/external/mpl/dhcp/dist/omapip/buffer.c Sat Jan 26 20:51:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: buffer.c,v 1.3 2019/01/10 17:41:47 christos Exp $ */
+/* $NetBSD: buffer.c,v 1.4 2019/01/27 01:51:50 christos Exp $ */
/* buffer.c
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: buffer.c,v 1.3 2019/01/10 17:41:47 christos Exp $");
+__RCSID("$NetBSD: buffer.c,v 1.4 2019/01/27 01:51:50 christos Exp $");
#include "dhcpd.h"
@@ -341,7 +341,6 @@ isc_result_t omapi_connection_copyin (om
status = ISC_R_SUCCESS;
leave:
-#if 0
/*
* If we have any bytes to send and we have a proper io object
* inform the socket code that we would like to know when we
@@ -355,7 +354,6 @@ isc_result_t omapi_connection_copyin (om
ISC_SOCKFDWATCH_WRITE);
}
}
-#endif
return (status);
}
Index: src/external/mpl/dhcp/dist/omapip/dispatch.c
diff -u src/external/mpl/dhcp/dist/omapip/dispatch.c:1.3 src/external/mpl/dhcp/dist/omapip/dispatch.c:1.4
--- src/external/mpl/dhcp/dist/omapip/dispatch.c:1.3 Thu Jan 10 12:41:47 2019
+++ src/external/mpl/dhcp/dist/omapip/dispatch.c Sat Jan 26 20:51:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dispatch.c,v 1.3 2019/01/10 17:41:47 christos Exp $ */
+/* $NetBSD: dispatch.c,v 1.4 2019/01/27 01:51:50 christos Exp $ */
/* dispatch.c
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: dispatch.c,v 1.3 2019/01/10 17:41:47 christos Exp $");
+__RCSID("$NetBSD: dispatch.c,v 1.4 2019/01/27 01:51:50 christos Exp $");
#include "dhcpd.h"
@@ -121,7 +121,6 @@ trigger_event(struct eventqueue **queue)
* 1 is delete, 0 is leave in place
*/
#define SOCKDELETE 1
-#ifdef ISC_SOCKFDWATCH_READ
static int
omapi_iscsock_cb(isc_task_t *task,
isc_socket_t *socket,
@@ -198,7 +197,6 @@ omapi_iscsock_cb(isc_task_t *task,
*/
return (0);
}
-#endif
/* Register an I/O handle so that we can do asynchronous I/O on it. */
@@ -214,9 +212,7 @@ isc_result_t omapi_register_io_object (o
{
isc_result_t status;
omapi_io_object_t *obj, *p;
-#ifdef ISC_SOCKFDWATCH_READ
int fd_flags = 0, fd = 0;
-#endif
/* omapi_io_states is a static object. If its reference count
is zero, this is the first I/O handle to be registered, so
@@ -254,7 +250,6 @@ isc_result_t omapi_register_io_object (o
* a write socket we asssume they are the same socket.
*/
-#ifdef ISC_SOCKFDWATCH_READ
if (readfd) {
fd_flags |= ISC_SOCKFDWATCH_READ;
fd = readfd(h);
@@ -283,7 +278,6 @@ isc_result_t omapi_register_io_object (o
return (status);
}
}
-#endif
/* Find the last I/O state, if there are any. */
@@ -324,9 +318,7 @@ isc_result_t omapi_reregister_io_object
(omapi_object_t *))
{
omapi_io_object_t *obj;
-#ifdef ISC_SOCKFDWATCH_READ
int fd_flags = 0;
-#endif
if ((!h -> outer) || (h -> outer -> type != omapi_type_io_object)) {
/*
@@ -352,7 +344,6 @@ isc_result_t omapi_reregister_io_object
obj->writer = writer;
obj->reaper = reaper;
-#ifdef ISC_SOCKFDWATCH_READ
if (readfd) {
fd_flags |= ISC_SOCKFDWATCH_READ;
}
@@ -362,7 +353,6 @@ isc_result_t omapi_reregister_io_object
}
isc_socket_fdwatchpoke(obj->fd, fd_flags);
-#endif
return (ISC_R_SUCCESS);
}
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Sun Jan 27 01:51:00 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc/include/isc: socket.h
src/external/mpl/bind/dist/lib/isc/unix: socket.c
Log Message:
graft back the fdwatch crap that dhcpd needs.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/lib/isc/include/isc/socket.h
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/unix/socket.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/include/isc/socket.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/socket.h:1.3 src/external/mpl/bind/dist/lib/isc/include/isc/socket.h:1.4
--- src/external/mpl/bind/dist/lib/isc/include/isc/socket.h:1.3 Wed Jan 9 11:55:15 2019
+++ src/external/mpl/bind/dist/lib/isc/include/isc/socket.h Sat Jan 26 20:51:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.h,v 1.3 2019/01/09 16:55:15 christos Exp $ */
+/* $NetBSD: socket.h,v 1.4 2019/01/27 01:51:00 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -245,7 +245,8 @@ typedef enum {
isc_sockettype_udp = 1,
isc_sockettype_tcp = 2,
isc_sockettype_unix = 3,
- isc_sockettype_raw = 4
+ isc_sockettype_raw = 4,
+ isc_sockettype_fdwatch = 5
} isc_sockettype_t;
/*@{*/
@@ -1039,6 +1040,82 @@ isc_socketmgr_renderjson(isc_socketmgr_t
*/
typedef isc_result_t
(*isc_socketmgrcreatefunc_t)(isc_mem_t *mctx, isc_socketmgr_t **managerp);
+/*!
+ * Flags for fdwatchcreate.
+ */
+#define ISC_SOCKFDWATCH_READ 0x0001 /*%< watch for readable */
+#define ISC_SOCKFDWATCH_WRITE 0x0002 /*%< watch for writable */
+/*@}*/
+
+isc_result_t
+isc_socket_fdwatchcreate(isc_socketmgr_t *manager,
+ int fd,
+ int flags,
+ isc_sockfdwatch_t callback,
+ void *cbarg,
+ isc_task_t *task,
+ isc_socket_t **socketp);
+/*%<
+ * Create a new file descriptor watch socket managed by 'manager'.
+ *
+ * Note:
+ *
+ *\li 'fd' is the already-opened file descriptor (must be less
+ * than maxsockets).
+ *\li This function is not available on Windows.
+ *\li The callback function is called "in-line" - this means the function
+ * needs to return as fast as possible, as all other I/O will be suspended
+ * until the callback completes.
+ *
+ * Requires:
+ *
+ *\li 'manager' is a valid manager
+ *
+ *\li 'socketp' is a valid pointer, and *socketp == NULL
+ *
+ *\li 'fd' be opened.
+ *
+ * Ensures:
+ *
+ * '*socketp' is attached to the newly created fdwatch socket
+ *
+ * Returns:
+ *
+ *\li #ISC_R_SUCCESS
+ *\li #ISC_R_NOMEMORY
+ *\li #ISC_R_NORESOURCES
+ *\li #ISC_R_UNEXPECTED
+ *\li #ISC_R_RANGE
+ */
+
+isc_result_t
+isc_socket_fdwatchpoke(isc_socket_t *sock,
+ int flags);
+/*%<
+ * Poke a file descriptor watch socket informing the manager that it
+ * should restart watching the socket
+ *
+ * Note:
+ *
+ *\li 'sock' is the socket returned by isc_socket_fdwatchcreate
+ *
+ *\li 'flags' indicates what the manager should watch for on the socket
+ * in addition to what it may already be watching. It can be one or
+ * both of ISC_SOCKFDWATCH_READ and ISC_SOCKFDWATCH_WRITE. To
+ * temporarily disable watching on a socket the value indicating
+ * no more data should be returned from the call back routine.
+ *
+ *\li This function is not available on Windows.
+ *
+ * Requires:
+ *
+ *\li 'sock' is a valid isc socket
+ *
+ *
+ * Returns:
+ *
+ *\li #ISC_R_SUCCESS
+ */
ISC_LANG_ENDDECLS
Index: src/external/mpl/bind/dist/lib/isc/unix/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.4 src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.5
--- src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.4 Wed Jan 9 11:55:17 2019
+++ src/external/mpl/bind/dist/lib/isc/unix/socket.c Sat Jan 26 20:51:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.4 2019/01/09 16:55:17 christos Exp $ */
+/* $NetBSD: socket.c,v 1.5 2019/01/27 01:51:00 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -351,6 +351,14 @@ struct isc__socket {
charname[16];
void *tag;
+ /*
+ * Internal events. Posted when a descriptor is readable or
+ * writable. These are statically allocated and never freed.
+ * They will be set to non-purgable before use.
+ */
+ intev_t readable_ev;
+ intev_t writable_ev;
+
ISC_LIST(isc_socketevent_t) send_list;
ISC_LIST(isc_socketevent_t) recv_list;
ISC_LIST(isc_socket_newconnev_t) accept_list;
@@ -358,7 +366,9 @@ struct isc__socket {
isc_sockaddr_t peer_address; /* remote address */
- unsigned int listener : 1, /* listener socket */
+ unsigned int pending_recv : 1,
+pending_send : 1,
+listener : 1, /* listener socket */
connected : 1,
connecting : 1, /* connect pending */
bound : 1, /* bound to local addr */
@@ -370,6 +380,10 @@ s
CVS commit: src/external/mpl/bind/include
Module Name:src Committed By: christos Date: Thu Jan 17 18:44:50 UTC 2019 Modified Files: src/external/mpl/bind/include: config.h Log Message: Enable stdatomic.h in all except lint (thanks joerg@) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 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.3 src/external/mpl/bind/include/config.h:1.4 --- src/external/mpl/bind/include/config.h:1.3 Wed Jan 9 11:55:22 2019 +++ src/external/mpl/bind/include/config.h Thu Jan 17 13:44:50 2019 @@ -373,7 +373,9 @@ /* #undef HAVE_STAT_NSEC */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_STDATOMIC_H */ +#ifndef __lint__ +#define HAVE_STDATOMIC_H 1 +#endif /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Fri Jan 11 02:44:49 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc: rwlock.c
Log Message:
disable pause, only works on v9
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/rwlock.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/rwlock.c
diff -u src/external/mpl/bind/dist/lib/isc/rwlock.c:1.4 src/external/mpl/bind/dist/lib/isc/rwlock.c:1.5
--- src/external/mpl/bind/dist/lib/isc/rwlock.c:1.4 Thu Jan 10 13:09:45 2019
+++ src/external/mpl/bind/dist/lib/isc/rwlock.c Thu Jan 10 21:44:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rwlock.c,v 1.4 2019/01/10 18:09:45 christos Exp $ */
+/* $NetBSD: rwlock.c,v 1.5 2019/01/11 02:44:49 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -58,7 +58,8 @@
# define isc_rwlock_pause() __asm__ __volatile__ ("hint @pause")
#elif defined(__arm__) && defined(_ARM_ARCH_6)
# define isc_rwlock_pause() __asm__ __volatile__ ("yield")
-#elif defined(__sparc) || defined(__sparc__)
+// Disable pause, only works on v9
+#elif (defined(__sparc) || defined(__sparc__)) && defined(notdef)
# define isc_rwlock_pause() __asm__ __volatile__ ("pause")
#elif defined(__ppc__) || defined(_ARCH_PPC) || \
defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Thu Jan 10 18:09:45 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc: rwlock.c
Log Message:
no yield for early arm
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/isc/rwlock.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/rwlock.c
diff -u src/external/mpl/bind/dist/lib/isc/rwlock.c:1.3 src/external/mpl/bind/dist/lib/isc/rwlock.c:1.4
--- src/external/mpl/bind/dist/lib/isc/rwlock.c:1.3 Wed Jan 9 11:55:14 2019
+++ src/external/mpl/bind/dist/lib/isc/rwlock.c Thu Jan 10 13:09:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rwlock.c,v 1.3 2019/01/09 16:55:14 christos Exp $ */
+/* $NetBSD: rwlock.c,v 1.4 2019/01/10 18:09:45 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -56,7 +56,7 @@
# define isc_rwlock_pause() __asm__ __volatile__ ("rep; nop")
#elif defined(__ia64__)
# define isc_rwlock_pause() __asm__ __volatile__ ("hint @pause")
-#elif defined(__arm__)
+#elif defined(__arm__) && defined(_ARM_ARCH_6)
# define isc_rwlock_pause() __asm__ __volatile__ ("yield")
#elif defined(__sparc) || defined(__sparc__)
# define isc_rwlock_pause() __asm__ __volatile__ ("pause")
CVS commit: src/external/mpl/dhcp
Module Name:src
Committed By: christos
Date: Thu Jan 10 17:41:48 UTC 2019
Modified Files:
src/external/mpl/dhcp: Makefile.inc
src/external/mpl/dhcp/dist/common: dns.c
src/external/mpl/dhcp/dist/omapip: buffer.c connection.c dispatch.c
isclib.c
src/external/mpl/dhcp/dist/server: dhcpv6.c mdb6.c
src/external/mpl/dhcp/include: config.h
Log Message:
Gut omapip support since the socket stuff to support it is gone, and
adjust to the new isc library reality.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/common/dns.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/omapip/buffer.c \
src/external/mpl/dhcp/dist/omapip/connection.c \
src/external/mpl/dhcp/dist/omapip/dispatch.c \
src/external/mpl/dhcp/dist/omapip/isclib.c
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/server/dhcpv6.c \
src/external/mpl/dhcp/dist/server/mdb6.c
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/dhcp/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/dhcp/Makefile.inc
diff -u src/external/mpl/dhcp/Makefile.inc:1.4 src/external/mpl/dhcp/Makefile.inc:1.5
--- src/external/mpl/dhcp/Makefile.inc:1.4 Sun Aug 12 11:39:22 2018
+++ src/external/mpl/dhcp/Makefile.inc Thu Jan 10 12:41:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2018/08/12 15:39:22 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2019/01/10 17:41:47 christos Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -10,7 +10,7 @@ CWARNFLAGS.clang+= -Wno-tautological-com
-Wno-format-security -Wno-error=unused-const-variable
DIST:= ${.PARSEDIR}/dist
-BIND:= ${.PARSEDIR}/../../bsd/bind/dist
+BIND:= ${.PARSEDIR}/../../mpl/bind/dist
.PATH: ${DIST}/${DHCPSRCDIR}
COBJDIR!=cd ${.PARSEDIR}/lib/common && ${PRINTOBJDIR}
Index: src/external/mpl/dhcp/dist/common/dns.c
diff -u src/external/mpl/dhcp/dist/common/dns.c:1.2 src/external/mpl/dhcp/dist/common/dns.c:1.3
--- src/external/mpl/dhcp/dist/common/dns.c:1.2 Sat Apr 7 18:37:29 2018
+++ src/external/mpl/dhcp/dist/common/dns.c Thu Jan 10 12:41:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dns.c,v 1.2 2018/04/07 22:37:29 christos Exp $ */
+/* $NetBSD: dns.c,v 1.3 2019/01/10 17:41:47 christos Exp $ */
/* dns.c
@@ -29,14 +29,13 @@
*/
#include
-__RCSID("$NetBSD: dns.c,v 1.2 2018/04/07 22:37:29 christos Exp $");
+__RCSID("$NetBSD: dns.c,v 1.3 2019/01/10 17:41:47 christos Exp $");
/*! \file common/dns.c
*/
#include "dhcpd.h"
#include "arpa/nameser.h"
-#include
-#include
+#include
#include
/*
@@ -1482,8 +1481,9 @@ static int get_std_dhcid(dhcp_ddns_cb_t
unsigned id_len)
{
struct data_string *id = &ddns_cb->dhcid;
- isc_sha256_t sha256;
- unsigned char buf[ISC_SHA256_DIGESTLENGTH];
+ isc_md_t *md;
+ isc_result_t result;
+ unsigned char buf[256]; // XXX: big enough > 32
unsigned char fwd_buf[256];
unsigned fwd_buflen = 0;
@@ -1491,6 +1491,11 @@ static int get_std_dhcid(dhcp_ddns_cb_t
if (type < 0 || type > 65535)
return (0);
+ md = isc_md_new();
+ if (md == NULL) {
+ return (0);
+ }
+
/* We need to convert the fwd name to wire representation */
if (MRns_name_pton((char *)ddns_cb->fwd_name.data, fwd_buf, 256) == -1)
return (0);
@@ -1511,17 +1516,41 @@ static int get_std_dhcid(dhcp_ddns_cb_t
/* The next is the digest type, SHA-256 is 1 */
putUChar(id->buffer->data + 2, 1u);
+
/* Computing the digest */
- isc_sha256_init(&sha256);
- isc_sha256_update(&sha256, identifier, id_len);
- isc_sha256_update(&sha256, fwd_buf, fwd_buflen);
- isc_sha256_final(buf, &sha256);
+ result = isc_md_init(md, ISC_MD_SHA256);
+ if (result != ISC_R_SUCCESS) {
+ goto end;
+ }
+
+ result = isc_md_update(md, identifier, id_len);
+ if (result != ISC_R_SUCCESS) {
+ goto end;
+ }
+
+ result = isc_md_update(md, fwd_buf, fwd_buflen);
+ if (result != ISC_R_SUCCESS) {
+ goto end;
+ }
+
+ result = isc_md_final(md, buf, &id_len);
+ if (result != ISC_R_SUCCESS) {
+ goto end;
+ }
+
+ isc_md_free(md);
+ md = NULL;
memcpy(id->buffer->data + 3, &buf, ISC_SHA256_DIGESTLENGTH);
id->len = ISC_SHA256_DIGESTLENGTH + 2 + 1;
return (1);
+end:
+ if (md != NULL) {
+ isc_md_free(md);
+ }
+ return (0);
}
/*!
@@ -1551,8 +1580,9 @@ static int get_int_dhcid (dhcp_ddns_cb_t
unsigned len)
{
struct data_string *id = &ddns_cb->dhcid;
- unsigned char buf[ISC_MD5_DIGESTLENGTH];
- isc_md5_t md5;
+ unsigned char buf[256]; // XXX: big enough (> 16)
+ isc_md_t *md;
+ isc_result_t result;
int i;
/* Types can only be 0..(2^16)-1. */
@@ -1584,9 +1614,28 @@ static int get_int_dhcid (dhcp_ddns_cb_t
id->buffer->data[2] = "0123456789abcdef"[type % 15];
/* Mash together an MD5 hash of the identifier. */
- isc_md5_init(&md5);
- isc_md5_update(&md5, data, len);
- isc_md5_final(&md5, buf);
+ md = isc_m
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Wed Jan 9 20:39:28 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc: stats.c
Log Message:
use 32 bit counters on 32 bit platforms because we don't yet have 64 bit
atomics for them.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/dist/lib/isc/stats.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/stats.c
diff -u src/external/mpl/bind/dist/lib/isc/stats.c:1.3 src/external/mpl/bind/dist/lib/isc/stats.c:1.4
--- src/external/mpl/bind/dist/lib/isc/stats.c:1.3 Wed Jan 9 11:55:14 2019
+++ src/external/mpl/bind/dist/lib/isc/stats.c Wed Jan 9 15:39:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: stats.c,v 1.3 2019/01/09 16:55:14 christos Exp $ */
+/* $NetBSD: stats.c,v 1.4 2019/01/09 20:39:28 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -32,7 +32,11 @@
#define ISC_STATS_MAGIC ISC_MAGIC('S', 't', 'a', 't')
#define ISC_STATS_VALID(x) ISC_MAGIC_VALID(x, ISC_STATS_MAGIC)
+#ifndef _LP64
+typedef atomic_int_fast32_t isc_stat_t;
+#else
typedef atomic_int_fast64_t isc_stat_t;
+#endif
struct isc_stats {
/*% Unlocked */
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Wed Jan 9 16:55:23 UTC 2019 Modified Files: src/external/mpl/bind: Makefile.inc bind2netbsd 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.8 named-checkconf.c named-checkzone.c src/external/mpl/bind/dist/bin/confgen: ddns-confgen.8 ddns-confgen.c keygen.c keygen.h rndc-confgen.8 rndc-confgen.c util.c src/external/mpl/bind/dist/bin/delv: delv.c src/external/mpl/bind/dist/bin/dig: dig.1 dig.c dighost.c host.1 host.c nslookup.1 nslookup.c src/external/mpl/bind/dist/bin/dig/include/dig: dig.h src/external/mpl/bind/dist/bin/dnssec: dnssec-cds.8 dnssec-cds.c dnssec-dsfromkey.8 dnssec-dsfromkey.c dnssec-importkey.c dnssec-keyfromlabel.8 dnssec-keyfromlabel.c dnssec-keygen.8 dnssec-keygen.c dnssec-revoke.c dnssec-settime.c dnssec-signzone.8 dnssec-signzone.c dnssec-verify.c dnssectool.c dnssectool.h src/external/mpl/bind/dist/bin/named: bind9.xsl.h config.c control.c controlconf.c fuzz.c log.c logconf.c main.c named.conf.5 server.c statschannel.c tkeyconf.c tsigconf.c zoneconf.c src/external/mpl/bind/dist/bin/named/include/named: config.h control.h globals.h log.h server.h tkeyconf.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: os.h src/external/mpl/bind/dist/bin/nsupdate: nsupdate.1 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-.8 filter-.c src/external/mpl/bind/dist/bin/python: dnssec-keymgr.8 src/external/mpl/bind/dist/bin/rndc: rndc.8 rndc.c util.c 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 byaddr_test.c byname_test.c db_test.c dst_test.c gsstest.c lfsr_test.c log_test.c master_test.c mempool_test.c name_test.c nsecify.c rbt_test.c rwlock_test.c serial_test.c shutdown_test.c sig0_test.c sym_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 src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c src/external/mpl/bind/dist/bin/tests/system/dyndb/driver: db.c driver.c instance.c instance.h syncptr.c zone.c src/external/mpl/bind/dist/bin/tests/system/pipelined: pipequeries.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/tests/virtual-time: vtwrapper.c src/external/mpl/bind/dist/bin/tools: arpaname.c dnstap-read.c mdig.1 mdig.c named-nzd2nzf.c named-rrchecker.c nsec3hash.c src/external/mpl/bind/dist/bin/win32/BINDInstall: StdAfx.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_filesystem_driver.c dlz_ldap_driver.c dlz_odbc_driver.c dlz_postgres_driver.c sdlz_helper.c src/external/mpl/bind/dist/contrib/dlz/drivers/include/dlz: sdlz_helper.h src/external/mpl/bind/dist/contrib/dlz/example: dlz_example.c src/external/mpl/bind/dist/contrib/dlz/modules/bdbhpt: dlz_bdbhpt_dynamic.c src/external/mpl/bind/dist/contrib/dlz/modules/common: dlz_dbi.c src/external/mpl/bind/dist/contrib/dlz/modules/filesystem: dlz_filesystem_dynamic.c src/external/mpl/bind/dist/contrib/dlz/modules/include: dlz_dbi.h dlz_minimal.h src/external/mpl/bind/dist/contrib/dlz/modules/ldap: dlz_ldap_dynamic.c src/external/mpl/bind/dist/contrib/dlz/modules/mysql: dlz_mysql_dynamic.c src/external/mpl/bind/dist/contrib/dlz/modules/mysqldyn: dlz_mysqldyn_mod.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/
CVS commit: src/external/mpl/bind/include
Module Name:src Committed By: christos Date: Tue Jan 8 22:19:28 UTC 2019 Modified Files: src/external/mpl/bind/include: config.h Log Message: PR/53845: Anthony Mallet: "bad cookie" in authoritative DNS server since bind 9.12 import. AES_CC needs to always be enabled. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 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.1 src/external/mpl/bind/include/config.h:1.2 --- src/external/mpl/bind/include/config.h:1.1 Sun Aug 12 09:02:42 2018 +++ src/external/mpl/bind/include/config.h Tue Jan 8 17:19:28 2019 @@ -150,11 +150,8 @@ int sigwait(const unsigned int *set, int /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ -#ifndef __NetBSD__ -/* defined by the build process */ /* Use AES for Client Cookie generation */ #define AES_CC 1 -#endif /* define if ATF unit tests are to be built. */ /* #undef ATF_TEST */
CVS commit: src/external/mpl/bind/dist/lib/dns
Module Name:src
Committed By: christos
Date: Wed Sep 12 15:28:42 UTC 2018
Modified Files:
src/external/mpl/bind/dist/lib/dns: view.c
Log Message:
Put the nta files in a subdirectory instead of requiring the namedb root
directory to be writable by named... Others have expressed the same concern,
but upstream refused: https://bugzilla.redhat.com/show_bug.cgi?id=1487823
https://bugs.isc.org/Public/Bug/Display.html?id=46242
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/dns/view.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/view.c
diff -u src/external/mpl/bind/dist/lib/dns/view.c:1.2 src/external/mpl/bind/dist/lib/dns/view.c:1.3
--- src/external/mpl/bind/dist/lib/dns/view.c:1.2 Sun Aug 12 09:02:35 2018
+++ src/external/mpl/bind/dist/lib/dns/view.c Wed Sep 12 11:28:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: view.c,v 1.2 2018/08/12 13:02:35 christos Exp $ */
+/* $NetBSD: view.c,v 1.3 2018/09/12 15:28:42 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -106,7 +106,7 @@ dns_view_create(isc_mem_t *mctx, dns_rda
goto cleanup_view;
}
- result = isc_file_sanitize(NULL, view->name, "nta",
+ result = isc_file_sanitize("nta", view->name, "nta",
buffer, sizeof(buffer));
if (result != ISC_R_SUCCESS)
goto cleanup_name;
CVS commit: src/external/mpl/bind
Module Name:src
Committed By: christos
Date: Thu Aug 16 16:34:33 UTC 2018
Modified Files:
src/external/mpl/bind: Makefile.inc
Log Message:
libisccfg uses libdns...
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 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.1 src/external/mpl/bind/Makefile.inc:1.2
--- src/external/mpl/bind/Makefile.inc:1.1 Sun Aug 12 09:02:24 2018
+++ src/external/mpl/bind/Makefile.inc Thu Aug 16 12:34:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2018/08/12 13:02:24 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2018/08/16 16:34:33 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -62,10 +62,10 @@ DBG=-g3 -gstabs
.if !defined(LIB) || empty(LIB)
# NOTE: the order of these libraries is important...
.if defined(NAMED_DEBUG)
-LDADD+= -lbind9_g -ldns_g -lirs_g -lisccfg_g -lisccc_g -lisc_g -lz_g
+LDADD+= -lbind9_g -lisccfg_g -ldns_g -lirs_g -lisccc_g -lisc_g -lz_g
.else
-LDADD+= -lbind9 -ldns -lirs -lisccfg
-DPADD+= ${LIBBIND9} ${LIBDNS} ${LIBIRS} ${LIBISCCFG}
+LDADD+= -lbind9 -lisccfg -ldns -lirs
+DPADD+= ${LIBBIND9} ${LIBISCCFG} ${LIBDNS} ${LIBIRS}
LDADD+= -lisccc -lisc -lz
DPADD+= ${LIBISCCC} ${LIBISC} ${LIBZ}
.endif
CVS commit: src/external/mpl/bind/bin/named
Module Name:src
Committed By: christos
Date: Tue Aug 14 11:52:56 UTC 2018
Modified Files:
src/external/mpl/bind/bin/named: Makefile
Log Message:
prepend libns
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/named/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/named/Makefile
diff -u src/external/mpl/bind/bin/named/Makefile:1.1 src/external/mpl/bind/bin/named/Makefile:1.2
--- src/external/mpl/bind/bin/named/Makefile:1.1 Sun Aug 12 09:02:26 2018
+++ src/external/mpl/bind/bin/named/Makefile Tue Aug 14 07:52:56 2018
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2018/08/12 13:02:26 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/08/14 11:52:56 christos Exp $
+
+LDADD+=-lns
+DPADD+=${LIBNS}
.include
@@ -37,8 +40,6 @@ SRCS= builtin.c config.c control.c contr
main.o: ${VERSIONFILE}
-LDADD+=-lns
-DPADD+=${LIBNS}
LDADD+=-lblacklist
DPADD+=${LIBBLACKLIST}
.include
CVS commit: src/external/mpl/bind/bin/check
Module Name:src
Committed By: christos
Date: Tue Aug 14 11:52:41 UTC 2018
Modified Files:
src/external/mpl/bind/bin/check: Makefile.inc
Log Message:
prepend libns
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/check/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/bin/check/Makefile.inc
diff -u src/external/mpl/bind/bin/check/Makefile.inc:1.1 src/external/mpl/bind/bin/check/Makefile.inc:1.2
--- src/external/mpl/bind/bin/check/Makefile.inc:1.1 Sun Aug 12 09:02:24 2018
+++ src/external/mpl/bind/bin/check/Makefile.inc Tue Aug 14 07:52:41 2018
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.1 2018/08/12 13:02:24 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2018/08/14 11:52:41 christos Exp $
+
+LDADD+=-lns
+DPADD+=${LIBNS}
.include
@@ -7,8 +10,6 @@
CPPFLAGS+=-DNAMED_CONFFILE=\"${SYSCONFDIR}/named.conf\"
BINDIR=/usr/sbin
CHECK=${IDIST}/bin/check
-LDADD+=-lns
-DPADD+=${LIBNS}
.PATH: ${CHECK}
CVS commit: src/external/mpl/bind/dist/lib/isc/unix
Module Name:src
Committed By: christos
Date: Mon Aug 13 08:48:46 UTC 2018
Modified Files:
src/external/mpl/bind/dist/lib/isc/unix: socket.c
Log Message:
Make ENOBUFS a soft error
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/isc/unix/socket.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/unix/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.2 src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.3
--- src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.2 Sun Aug 12 09:02:39 2018
+++ src/external/mpl/bind/dist/lib/isc/unix/socket.c Mon Aug 13 04:48:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.2 2018/08/12 13:02:39 christos Exp $ */
+/* $NetBSD: socket.c,v 1.3 2018/08/13 08:48:46 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -258,6 +258,7 @@ typedef enum { poll_idle, poll_active, p
#define SOFT_ERROR(e) ((e) == EAGAIN || \
(e) == EWOULDBLOCK || \
(e) == EINTR || \
+ (e) == ENOBUFS || \
(e) == 0)
#define DLVL(x) ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(x)
@@ -1953,7 +1954,7 @@ doio_recv(isc__socket_t *sock, isc_socke
SOFT_OR_HARD(EHOSTDOWN, ISC_R_HOSTDOWN);
/* HPUX 11.11 can return EADDRNOTAVAIL. */
SOFT_OR_HARD(EADDRNOTAVAIL, ISC_R_ADDRNOTAVAIL);
- ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES);
+ SOFT_OR_HARD(ENOBUFS, ISC_R_NORESOURCES);
/* Should never get this one but it was seen. */
#ifdef ENOPROTOOPT
SOFT_OR_HARD(ENOPROTOOPT, ISC_R_HOSTUNREACH);
@@ -2150,7 +2151,7 @@ doio_send(isc__socket_t *sock, isc_socke
ALWAYS_HARD(EHOSTDOWN, ISC_R_HOSTUNREACH);
#endif
ALWAYS_HARD(ENETUNREACH, ISC_R_NETUNREACH);
- ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES);
+ SOFT_OR_HARD(ENOBUFS, ISC_R_NORESOURCES);
ALWAYS_HARD(EPERM, ISC_R_HOSTUNREACH);
ALWAYS_HARD(EPIPE, ISC_R_NOTCONNECTED);
ALWAYS_HARD(ECONNRESET, ISC_R_CONNECTIONRESET);
CVS commit: src/external/mpl/bind/include/isc
Module Name:src
Committed By: mrg
Date: Mon Aug 13 07:17:34 UTC 2018
Modified Files:
src/external/mpl/bind/include/isc: platform.h
Log Message:
avoid using x86 specific asm on all platforms.
XXX: this might want to be expanded or something more portable used.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/include/isc/platform.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/isc/platform.h
diff -u src/external/mpl/bind/include/isc/platform.h:1.2 src/external/mpl/bind/include/isc/platform.h:1.3
--- src/external/mpl/bind/include/isc/platform.h:1.2 Sun Aug 12 20:16:10 2018
+++ src/external/mpl/bind/include/isc/platform.h Mon Aug 13 07:17:34 2018
@@ -346,7 +346,11 @@
/*
* Define with the busy wait nop asm or function call.
*/
+#if defined(__x86_64__) || defined(__i386__)
#define ISC_PLATFORM_BUSYWAITNOP asm("rep; nop")
+#else
+#undef ISC_PLATFORM_BUSYWAITNOP
+#endif
/*
* Define if the platform has .
CVS commit: src/external/mpl/bind/include/isc
Module Name:src Committed By: christos Date: Sun Aug 12 20:16:10 UTC 2018 Modified Files: src/external/mpl/bind/include/isc: platform.h Log Message: don't use stdatomic.h yet; there is no support for the _8 functions on ILP32 so we end up with undefined symbols. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/include/isc/platform.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/isc/platform.h diff -u src/external/mpl/bind/include/isc/platform.h:1.1 src/external/mpl/bind/include/isc/platform.h:1.2 --- src/external/mpl/bind/include/isc/platform.h:1.1 Sun Aug 12 09:02:43 2018 +++ src/external/mpl/bind/include/isc/platform.h Sun Aug 12 16:16:10 2018 @@ -324,7 +324,7 @@ * If is available on this architecture, * ISC_PLATFORM_HAVESTDATOMIC will be defined. */ -#ifndef __lint__ +#ifdef notyet #define ISC_PLATFORM_HAVESTDATOMIC 1 #endif
CVS commit: src/external/mpl/dhcp
Module Name:src
Committed By: christos
Date: Sun Aug 12 15:39:22 UTC 2018
Modified Files:
src/external/mpl/dhcp: Makefile.inc
Log Message:
Add libz for new libisc needing it.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/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/dhcp/Makefile.inc
diff -u src/external/mpl/dhcp/Makefile.inc:1.3 src/external/mpl/dhcp/Makefile.inc:1.4
--- src/external/mpl/dhcp/Makefile.inc:1.3 Fri Jun 22 16:48:43 2018
+++ src/external/mpl/dhcp/Makefile.inc Sun Aug 12 11:39:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2018/06/22 20:48:43 christos Exp $
+# $NetBSD: Makefile.inc,v 1.4 2018/08/12 15:39:22 christos Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -38,7 +38,7 @@ LDADD+= ${OMOBJDIR}/libomapi.a
LDADD+=-Wl,-Bstatic
.endif
LDADD+= -lirs -lisccfg -ldns -lisc
-LDADD+=-lpthread
+LDADD+=-lpthread -lz
.if (${MKKERBEROS} != "no")
LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD} ${LIBKRB5_STATIC_LDADD}
DPADD+= ${LIBKRB5_DPADD} ${LIBHEIMNTLM} ${LIBGSSAPI} ${LIBKRB5_STATIC_DPADD}
@@ -54,4 +54,4 @@ LDADD+=-Wl,-Bdynamic
DPADD+= ${COBJDIR}/libdhcp.a
DPADD+= ${OMOBJDIR}/libomapi.a
DPADD+= ${LIBDNS} ${LIBISC}
-DPADD+= ${LIBPTHREAD}
+DPADD+= ${LIBPTHREAD} ${LIBZ}
CVS commit: src/external/mpl/bind/lib/libisc
Module Name:src
Committed By: christos
Date: Sun Aug 12 15:37:06 UTC 2018
Modified Files:
src/external/mpl/bind/lib/libisc: Makefile
Log Message:
Add -lz
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 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.1 src/external/mpl/bind/lib/libisc/Makefile:1.2
--- src/external/mpl/bind/lib/libisc/Makefile:1.1 Sun Aug 12 09:02:43 2018
+++ src/external/mpl/bind/lib/libisc/Makefile Sun Aug 12 11:37:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/08/12 13:02:43 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/08/12 15:37:06 christos Exp $
LIB=isc
#USE_SHLIBDIR= yes
@@ -45,4 +45,7 @@ CPPFLAGS.net.c= -Wno-error
SRCS+= ipv6.c
.endif
+LDADD+=-lz
+DPADD+=${LIBZ}
+
.include
CVS commit: src/external/mpl/bind/lib
Module Name:src Committed By: christos Date: Sun Aug 12 14:32:39 UTC 2018 Modified Files: src/external/mpl/bind/lib: Makefile Log Message: add libns To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/lib/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/Makefile diff -u src/external/mpl/bind/lib/Makefile:1.1 src/external/mpl/bind/lib/Makefile:1.2 --- src/external/mpl/bind/lib/Makefile:1.1 Sun Aug 12 09:02:43 2018 +++ src/external/mpl/bind/lib/Makefile Sun Aug 12 10:32:39 2018 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2018/08/12 13:02:43 christos Exp $ +# $NetBSD: Makefile,v 1.2 2018/08/12 14:32:39 christos Exp $ SUBDIR+= libisc .WAIT libdns libisccc .WAIT libisccfg .WAIT libbind9 libirs +SUBDIR+= libns .include
CVS commit: src/external/mpl
Module Name:src Committed By: christos Date: Sun Aug 12 13:03:09 UTC 2018 Modified Files: src/external/mpl: Makefile Log Message: hook bind To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/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/Makefile diff -u src/external/mpl/Makefile:1.1 src/external/mpl/Makefile:1.2 --- src/external/mpl/Makefile:1.1 Sat Apr 7 21:30:01 2018 +++ src/external/mpl/Makefile Sun Aug 12 09:03:08 2018 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2018/04/08 01:30:01 christos Exp $ +# $NetBSD: Makefile,v 1.2 2018/08/12 13:03:08 christos Exp $ .include -SUBDIR= dhcp +SUBDIR= bind dhcp .include
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Sun Aug 12 13:02:44 UTC 2018 Modified Files: src/external/mpl/bind/dist: Makefile.in acconfig.h bind.keys.h config.guess config.h.in config.sub configure configure.in isc-config.sh.1 src/external/mpl/bind/dist/bin/check: check-tool.c check-tool.h named-checkconf.8 named-checkconf.c named-checkzone.8 named-checkzone.c src/external/mpl/bind/dist/bin/confgen: ddns-confgen.8 ddns-confgen.c keygen.c keygen.h rndc-confgen.8 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.1 delv.c src/external/mpl/bind/dist/bin/dig: dig.1 dig.c dighost.c host.1 host.c nslookup.1 nslookup.c src/external/mpl/bind/dist/bin/dig/include/dig: dig.h src/external/mpl/bind/dist/bin/dnssec: dnssec-cds.8 dnssec-cds.c dnssec-dsfromkey.8 dnssec-dsfromkey.c dnssec-importkey.8 dnssec-importkey.c dnssec-keyfromlabel.8 dnssec-keyfromlabel.c dnssec-keygen.8 dnssec-keygen.c dnssec-revoke.8 dnssec-revoke.c dnssec-settime.8 dnssec-settime.c dnssec-signzone.8 dnssec-signzone.c dnssec-verify.8 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 named.8 named.conf.5 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 seccomp.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.1 nsupdate.c src/external/mpl/bind/dist/bin/pkcs11: pkcs11-destroy.8 pkcs11-destroy.c pkcs11-keygen.8 pkcs11-keygen.c pkcs11-list.8 pkcs11-list.c pkcs11-tokens.8 pkcs11-tokens.c src/external/mpl/bind/dist/bin/python: dnssec-checkds.8 dnssec-coverage.8 dnssec-keymgr.8 src/external/mpl/bind/dist/bin/rndc: rndc.8 rndc.c rndc.conf.5 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 dst_test.c entropy2_test.c entropy_test.c fsaccess_test.c gsstest.c hash_test.c inter_test.c keyboard_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: pkcs11-hmacmd5.c pkcs11-md5sum.c src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: create.c find.c genrsa.c login.c privrsa.c pubrsa.c random.c session.c sha1.c sign.c verify.c src/external/mpl/bind/dist/bin/tests/system: feature-test.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/dlz/ns1/dns-root/com/example/xfr.d: 10.53.0.1 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/
CVS commit: src/external/mpl/dhcp
Module Name:src
Committed By: christos
Date: Fri Jun 22 20:48:44 UTC 2018
Modified Files:
src/external/mpl/dhcp: Makefile.inc
Log Message:
Explain the -Bstatic -Bdynamic dance.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/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/dhcp/Makefile.inc
diff -u src/external/mpl/dhcp/Makefile.inc:1.2 src/external/mpl/dhcp/Makefile.inc:1.3
--- src/external/mpl/dhcp/Makefile.inc:1.2 Thu Jun 21 07:02:48 2018
+++ src/external/mpl/dhcp/Makefile.inc Fri Jun 22 16:48:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2018/06/21 11:02:48 kamil Exp $
+# $NetBSD: Makefile.inc,v 1.3 2018/06/22 20:48:43 christos Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -31,6 +31,10 @@ CPPFLAGS+= -DLOCALSTATEDIR='"/var"'
LDADD+= ${COBJDIR}/libdhcp.a
LDADD+= ${OMOBJDIR}/libomapi.a
.if defined(PROG) && ${PROG} == "dhclient" && ${MKSANITIZER:Uno} != "yes"
+# We link the libraries that are in /usr/lib and not in /lib statically
+# because dhclient is in /sbin and is needed before /usr is mounted in
+# some configurations with a split / and /usr. Another way to fix this,
+# would be to install the libraries in /lib...
LDADD+=-Wl,-Bstatic
.endif
LDADD+= -lirs -lisccfg -ldns -lisc
CVS commit: src/external/mpl/dhcp
Module Name:src
Committed By: kamil
Date: Thu Jun 21 11:02:48 UTC 2018
Modified Files:
src/external/mpl/dhcp: Makefile.inc
Log Message:
Make building of dhcp compatible with MKSANITIZER
Disable LD flags (-Wl,-Bstatic and -Wl,-Bdynamic) with enabled MKSANITIZER.
These options are incompatible with the current design of sanitizers,
because they cause duplication of symbols into programs and thus symbols
from the interceptors from sanitizers cannot be linked.
This change makes effectively mounting /usr required for dhcp programs like
dhclient(8).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/dhcp/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/dhcp/Makefile.inc
diff -u src/external/mpl/dhcp/Makefile.inc:1.1 src/external/mpl/dhcp/Makefile.inc:1.2
--- src/external/mpl/dhcp/Makefile.inc:1.1 Sat Apr 7 22:31:36 2018
+++ src/external/mpl/dhcp/Makefile.inc Thu Jun 21 11:02:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2018/04/07 22:31:36 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2018/06/21 11:02:48 kamil Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -30,7 +30,7 @@ CPPFLAGS+= -I${BIND}/lib/${dir}/pthreads
CPPFLAGS+= -DLOCALSTATEDIR='"/var"'
LDADD+= ${COBJDIR}/libdhcp.a
LDADD+= ${OMOBJDIR}/libomapi.a
-.if defined(PROG) && ${PROG} == "dhclient"
+.if defined(PROG) && ${PROG} == "dhclient" && ${MKSANITIZER:Uno} != "yes"
LDADD+=-Wl,-Bstatic
.endif
LDADD+= -lirs -lisccfg -ldns -lisc
@@ -39,12 +39,12 @@ LDADD+=-lpthread
LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD} ${LIBKRB5_STATIC_LDADD}
DPADD+= ${LIBKRB5_DPADD} ${LIBHEIMNTLM} ${LIBGSSAPI} ${LIBKRB5_STATIC_DPADD}
.endif
-.if defined(PROG) && ${PROG} == "dhclient"
+.if defined(PROG) && ${PROG} == "dhclient" && ${MKSANITIZER:Uno} != "yes"
LDADD+=-Wl,-Bdynamic
.endif
LDADD+= -lcrypto -lipsec -lcrypt
DPADD+= ${LIBCRYPTO} ${LIBIPSEC} ${LIBCRYPT}
-.if defined(PROG) && ${PROG} == "dhclient"
+.if defined(PROG) && ${PROG} == "dhclient" && ${MKSANITIZER:Uno} != "yes"
LDADD+=-Wl,-Bdynamic
.endif
DPADD+= ${COBJDIR}/libdhcp.a
CVS commit: src/external/mpl/dhcp/dist/common
Module Name:src
Committed By: christos
Date: Fri Jun 1 00:42:49 UTC 2018
Modified Files:
src/external/mpl/dhcp/dist/common: bpf.c
Log Message:
PR/50893: Bruce Lilly: Handle carp interfaces.
XXX: pullup-8 (in src/external/bsd/dhcp/dist/common/bpf.c)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/dhcp/dist/common/bpf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/dist/common/bpf.c
diff -u src/external/mpl/dhcp/dist/common/bpf.c:1.2 src/external/mpl/dhcp/dist/common/bpf.c:1.3
--- src/external/mpl/dhcp/dist/common/bpf.c:1.2 Sat Apr 7 18:37:29 2018
+++ src/external/mpl/dhcp/dist/common/bpf.c Thu May 31 20:42:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.2 2018/04/07 22:37:29 christos Exp $ */
+/* $NetBSD: bpf.c,v 1.3 2018/06/01 00:42:49 christos Exp $ */
/* bpf.c
@@ -35,7 +35,7 @@
*/
#include
-__RCSID("$NetBSD: bpf.c,v 1.2 2018/04/07 22:37:29 christos Exp $");
+__RCSID("$NetBSD: bpf.c,v 1.3 2018/06/01 00:42:49 christos Exp $");
#include "dhcpd.h"
#if defined (USE_BPF_SEND) || defined (USE_BPF_RECEIVE) \
@@ -674,6 +674,9 @@ get_hw_addr(const char *name, struct har
*/
switch (sa->sdl_type) {
case IFT_ETHER:
+#ifdef IFT_CARP
+ case IFT_CARP:
+#endif
#if defined (IFT_L2VLAN)
case IFT_L2VLAN:
#endif
CVS commit: src/external/mpl
Module Name:src Committed By: christos Date: Sun Apr 8 01:30:01 UTC 2018 Added Files: src/external/mpl: Makefile Log Message: add a Makefile To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/mpl/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/Makefile diff -u /dev/null src/external/mpl/Makefile:1.1 --- /dev/null Sat Apr 7 21:30:01 2018 +++ src/external/mpl/Makefile Sat Apr 7 21:30:01 2018 @@ -0,0 +1,7 @@ +# $NetBSD: Makefile,v 1.1 2018/04/08 01:30:01 christos Exp $ + +.include + +SUBDIR= dhcp + +.include
CVS commit: src/external/mpl/dhcp
Module Name:src Committed By: christos Date: Sat Apr 7 22:34:51 UTC 2018 Modified Files: src/external/mpl/dhcp: dhcp2netbsd Log Message: now mpl To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mpl/dhcp/dhcp2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mpl/dhcp/dhcp2netbsd diff -u src/external/mpl/dhcp/dhcp2netbsd:1.1 src/external/mpl/dhcp/dhcp2netbsd:1.2 --- src/external/mpl/dhcp/dhcp2netbsd:1.1 Sat Apr 7 18:31:36 2018 +++ src/external/mpl/dhcp/dhcp2netbsd Sat Apr 7 18:34:51 2018 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: dhcp2netbsd,v 1.1 2018/04/07 22:31:36 christos Exp $ +# $NetBSD: dhcp2netbsd,v 1.2 2018/04/07 22:34:51 christos Exp $ # # Copyright (c) 2003, 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -97,6 +97,6 @@ done echo done echo You can import now. Use the following command: -echo cvs -d cvs.netbsd.org:/cvsroot import src/external/bsd/dhcp/dist ISC DHCPX_Y_Z +echo cvs -d cvs.netbsd.org:/cvsroot import src/external/mpl/dhcp/dist ISC DHCPX_Y_Z exit 0
CVS commit: src/external/mpl/dhcp
Module Name:src
Committed By: christos
Date: Sat Apr 7 22:31:38 UTC 2018
Added Files:
src/external/mpl/dhcp: Makefile Makefile.inc dhcp2netbsd
src/external/mpl/dhcp/bin: Makefile Makefile.inc
src/external/mpl/dhcp/bin/client: Makefile
src/external/mpl/dhcp/bin/clientscript: Makefile dhclient-script
src/external/mpl/dhcp/bin/omshell: Makefile
src/external/mpl/dhcp/bin/relay: Makefile
src/external/mpl/dhcp/bin/server: Makefile dhcpd.conf
src/external/mpl/dhcp/include: config.h
src/external/mpl/dhcp/lib: Makefile Makefile.inc
src/external/mpl/dhcp/lib/common: Makefile
src/external/mpl/dhcp/lib/dhcpctl: Makefile
src/external/mpl/dhcp/lib/omapip: Makefile
src/external/mpl/dhcp/share: Makefile
src/external/mpl/dhcp/share/dhcpd: Makefile pxe.defs
Log Message:
Add build glue.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/Makefile \
src/external/mpl/dhcp/Makefile.inc src/external/mpl/dhcp/dhcp2netbsd
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/bin/Makefile \
src/external/mpl/dhcp/bin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/bin/client/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/bin/clientscript/Makefile \
src/external/mpl/dhcp/bin/clientscript/dhclient-script
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/bin/omshell/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/bin/relay/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/bin/server/Makefile \
src/external/mpl/dhcp/bin/server/dhcpd.conf
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/include/config.h
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/lib/Makefile \
src/external/mpl/dhcp/lib/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/lib/common/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/lib/dhcpctl/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/lib/omapip/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/share/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mpl/dhcp/share/dhcpd/Makefile \
src/external/mpl/dhcp/share/dhcpd/pxe.defs
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/dhcp/Makefile
diff -u /dev/null src/external/mpl/dhcp/Makefile:1.1
--- /dev/null Sat Apr 7 18:31:38 2018
+++ src/external/mpl/dhcp/Makefile Sat Apr 7 18:31:36 2018
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2018/04/07 22:31:36 christos Exp $
+
+SUBDIR= lib share .WAIT bin
+
+.include
Index: src/external/mpl/dhcp/Makefile.inc
diff -u /dev/null src/external/mpl/dhcp/Makefile.inc:1.1
--- /dev/null Sat Apr 7 18:31:38 2018
+++ src/external/mpl/dhcp/Makefile.inc Sat Apr 7 18:31:36 2018
@@ -0,0 +1,53 @@
+# $NetBSD: Makefile.inc,v 1.1 2018/04/07 22:31:36 christos Exp $
+
+WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
+
+.include
+
+USE_FORT?= yes # network client/server
+CWARNFLAGS.clang+= -Wno-tautological-compare \
+ -Wno-conversion -Wno-constant-logical-operand \
+ -Wno-format-security -Wno-error=unused-const-variable
+
+DIST:= ${.PARSEDIR}/dist
+BIND:= ${.PARSEDIR}/../../bsd/bind/dist
+.PATH: ${DIST}/${DHCPSRCDIR}
+
+COBJDIR!=cd ${.PARSEDIR}/lib/common && ${PRINTOBJDIR}
+OMOBJDIR!=cd ${.PARSEDIR}/lib/omapip && ${PRINTOBJDIR}
+
+.if (${USE_INET6} != "no")
+CPPFLAGS+= -DDHCPv6
+.endif
+CPPFLAGS+= -DISC_PLATFORM_USETHREADS -DHAVE_CONFIG_H
+CPPFLAGS+= -I${DIST} -I${DIST}/includes -I${DIST}/../include
+CPPFLAGS+= -I${BIND} -I${BIND}/includes -I${BIND}/../include
+.for dir in isc dns irs
+CPPFLAGS+= -I${BIND}/lib/${dir}/include
+CPPFLAGS+= -I${BIND}/lib/${dir}/unix/include
+CPPFLAGS+= -I${BIND}/lib/${dir}/pthreads/include
+.endfor
+CPPFLAGS+= -DLOCALSTATEDIR='"/var"'
+LDADD+= ${COBJDIR}/libdhcp.a
+LDADD+= ${OMOBJDIR}/libomapi.a
+.if defined(PROG) && ${PROG} == "dhclient"
+LDADD+=-Wl,-Bstatic
+.endif
+LDADD+= -lirs -lisccfg -ldns -lisc
+LDADD+=-lpthread
+.if (${MKKERBEROS} != "no")
+LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD} ${LIBKRB5_STATIC_LDADD}
+DPADD+= ${LIBKRB5_DPADD} ${LIBHEIMNTLM} ${LIBGSSAPI} ${LIBKRB5_STATIC_DPADD}
+.endif
+.if defined(PROG) && ${PROG} == "dhclient"
+LDADD+=-Wl,-Bdynamic
+.endif
+LDADD+= -lcrypto -lipsec -lcrypt
+DPADD+= ${LIBCRYPTO} ${LIBIPSEC} ${LIBCRYPT}
+.if defined(PROG) && ${PROG} == "dhclient"
+LDADD+=-Wl,-Bdynamic
+.endif
+DPADD+= ${COBJDIR}/libdhcp.a
+DPADD+= ${OMOBJDIR}/libomapi.a
+DPADD+= ${LIBDNS} ${LIBISC}
+DPADD+= ${LIBPTHREAD}
Index: src/external/mpl/dhcp/dhcp2netbsd
diff -u /dev/null src/external/mpl/dhcp/dhcp2netbsd:1.1
--- /dev/null Sat Apr 7 18:31:38 2018
+++ src/external/mpl/dhcp/dhcp2netbsd Sat Apr 7 18:31:36 2018
@@ -0,0 +1,102 @@
+#! /bin/sh
+#
+# $NetBSD: dhcp2netbsd,v 1.1 2018/04/07 22:31:36 christos Exp $
+#
+# Copyright (c) 2003, 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are per
