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 <inttypes.h>
#include <stdbool.h>
-#include <stdlib.h>
#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 19 16:42:18 2021
+++ src/external/mpl/bind/dist/lib/dns/tests/dnstest.h Mon Apr 5 11:36:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dnstest.h,v 1.5 2021/02/19 16:42:18 christos Exp $ */
+/* $NetBSD: dnstest.h,v 1.6 2021/04/05 11:36:55 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -29,7 +29,6 @@
#include <dns/result.h>
#include <dns/zone.h>
-
typedef struct {
dns_diffop_t op;
const char *owner;
Index: src/external/mpl/bind/dist/lib/isc/netmgr/udp.c
diff -u src/external/mpl/bind/dist/lib/isc/netmgr/udp.c:1.6 src/external/mpl/bind/dist/lib/isc/netmgr/udp.c:1.7
--- src/external/mpl/bind/dist/lib/isc/netmgr/udp.c:1.6 Mon Apr 5 10:19:34 2021
+++ src/external/mpl/bind/dist/lib/isc/netmgr/udp.c Mon Apr 5 11:36:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: udp.c,v 1.6 2021/04/05 10:19:34 rillig Exp $ */
+/* $NetBSD: udp.c,v 1.7 2021/04/05 11:36:55 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -542,8 +542,9 @@ isc__nm_udp_send(isc_nmhandle_t *handle,
}
if (isc_nm_tid() == rsock->tid) {
- isc__netievent_udpsend_t ievent
- = { .sock = rsock, .req = uvreq, .peer = *peer };
+ isc__netievent_udpsend_t ievent = { .sock = rsock,
+ .req = uvreq,
+ .peer = *peer };
isc__nm_async_udpsend(NULL, (isc__netievent_t *)&ievent);
} else {
