Module Name: src
Committed By: christos
Date: Mon Jun 26 22:03:01 UTC 2023
Modified Files:
src/external/mpl/bind/dist: configure
src/external/mpl/bind/dist/bin/dig: dighost.c
src/external/mpl/bind/dist/bin/named: controlconf.c logconf.c main.c
server.c zoneconf.c
src/external/mpl/bind/dist/bin/nsupdate: nsupdate.c
src/external/mpl/bind/dist/bin/rndc: rndc.c
src/external/mpl/bind/dist/bin/tests/optional: ratelimiter_test.c
rbt_test.c shutdown_test.c sock_test.c task_test.c timer_test.c
src/external/mpl/bind/dist/bin/tests/system: feature-test.c
src/external/mpl/bind/dist/fuzz: fuzz.h
src/external/mpl/bind/dist/lib/dns: catz.c dnsrps.c hmac_link.c
keymgr.c keytable.c master.c nsec3.c nta.c rbt.c rbtdb.c request.c
resolver.c rpz.c validator.c view.c xfrin.c zone.c
src/external/mpl/bind/dist/lib/dns/include/dns: view.h zt.h
src/external/mpl/bind/dist/lib/irs: getaddrinfo.c resconf.c
src/external/mpl/bind/dist/lib/isc: iterated_hash.c lib.c log.c mem.c
ratelimiter.c task.c timer.c
src/external/mpl/bind/dist/lib/isc/include/isc: task.h timer.h
src/external/mpl/bind/dist/lib/isc/netmgr: netmgr.c
src/external/mpl/bind/dist/lib/isc/tests: task_test.c timer_test.c
src/external/mpl/bind/dist/lib/ns: query.c
src/external/mpl/bind/lib/libisc: Makefile
Removed Files:
src/external/mpl/bind/dist: tsan-suppressions.txt
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1:
controls.conf.in named.dirconf named.iso8601 named.iso8601-utc
named.pipeconf named.plain named.plainconf named.symconf
named.tsconf named.unlimited named.versconf rndc.conf.in root.db
src/external/mpl/bind/dist/bin/tests/system/ttl: tests.sh
src/external/mpl/bind/dist/doc/man: named-compilezone.1in
Log Message:
merge conflicts between 9.16.37 and 9.16.42
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/mpl/bind/dist/configure
cvs rdiff -u -r1.1.1.1 -r0 src/external/mpl/bind/dist/tsan-suppressions.txt
cvs rdiff -u -r1.14 -r1.15 src/external/mpl/bind/dist/bin/dig/dighost.c
cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/bin/named/controlconf.c
cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/bin/named/logconf.c
cvs rdiff -u -r1.14 -r1.15 src/external/mpl/bind/dist/bin/named/main.c
cvs rdiff -u -r1.19 -r1.20 src/external/mpl/bind/dist/bin/named/server.c
cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/bin/named/zoneconf.c
cvs rdiff -u -r1.12 -r1.13 src/external/mpl/bind/dist/bin/nsupdate/nsupdate.c
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/bin/rndc/rndc.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/mpl/bind/dist/bin/tests/optional/ratelimiter_test.c \
src/external/mpl/bind/dist/bin/tests/optional/sock_test.c \
src/external/mpl/bind/dist/bin/tests/optional/task_test.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/mpl/bind/dist/bin/tests/optional/rbt_test.c \
src/external/mpl/bind/dist/bin/tests/optional/shutdown_test.c \
src/external/mpl/bind/dist/bin/tests/optional/timer_test.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/mpl/bind/dist/bin/tests/system/feature-test.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/controls.conf.in \
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/rndc.conf.in \
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/root.db
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.dirconf
\
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601
\
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601-utc
\
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.pipeconf \
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plain \
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plainconf \
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.symconf
\
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.tsconf \
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.unlimited \
src/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.versconf
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/mpl/bind/dist/bin/tests/system/ttl/tests.sh
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mpl/bind/dist/doc/man/named-compilezone.1in
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/fuzz/fuzz.h
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/dns/catz.c \
src/external/mpl/bind/dist/lib/dns/dnsrps.c \
src/external/mpl/bind/dist/lib/dns/keymgr.c
cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/lib/dns/hmac_link.c \
src/external/mpl/bind/dist/lib/dns/request.c
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/dns/keytable.c \
src/external/mpl/bind/dist/lib/dns/nta.c
cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/lib/dns/master.c
cvs rdiff -u -r1.11 -r1.12 src/external/mpl/bind/dist/lib/dns/nsec3.c
cvs rdiff -u -r1.12 -r1.13 src/external/mpl/bind/dist/lib/dns/rbt.c \
src/external/mpl/bind/dist/lib/dns/rpz.c \
src/external/mpl/bind/dist/lib/dns/validator.c \
src/external/mpl/bind/dist/lib/dns/xfrin.c
cvs rdiff -u -r1.16 -r1.17 src/external/mpl/bind/dist/lib/dns/rbtdb.c \
src/external/mpl/bind/dist/lib/dns/resolver.c
cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/lib/dns/view.c
cvs rdiff -u -r1.17 -r1.18 src/external/mpl/bind/dist/lib/dns/zone.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/mpl/bind/dist/lib/dns/include/dns/view.h
cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/lib/dns/include/dns/zt.h
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/irs/getaddrinfo.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/irs/resconf.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/isc/iterated_hash.c
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/isc/lib.c
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/isc/log.c
cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/lib/isc/mem.c
cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/lib/isc/ratelimiter.c
cvs rdiff -u -r1.17 -r1.18 src/external/mpl/bind/dist/lib/isc/task.c
cvs rdiff -u -r1.11 -r1.12 src/external/mpl/bind/dist/lib/isc/timer.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/mpl/bind/dist/lib/isc/include/isc/task.h \
src/external/mpl/bind/dist/lib/isc/include/isc/timer.h
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/isc/netmgr/netmgr.c
cvs rdiff -u -r1.11 -r1.12 \
src/external/mpl/bind/dist/lib/isc/tests/task_test.c
cvs rdiff -u -r1.9 -r1.10 \
src/external/mpl/bind/dist/lib/isc/tests/timer_test.c
cvs rdiff -u -r1.16 -r1.17 src/external/mpl/bind/dist/lib/ns/query.c
cvs rdiff -u -r1.19 -r1.20 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.
