CVSROOT: /cvs Module name: src Changes by: st...@cvs.openbsd.org 2021/04/01 03:55:17
Log message: import NSD 4.3.6rc1, tested by me and florian@ Status: Vendor Tag: NLNETLABS Release Tags: NSD_4_3_6rc1 U src/usr.sbin/nsd/region-allocator.c C src/usr.sbin/nsd/xfrd.c U src/usr.sbin/nsd/zonec.c C src/usr.sbin/nsd/axfr.c C src/usr.sbin/nsd/nsec3.c C src/usr.sbin/nsd/query.h U src/usr.sbin/nsd/nsd.h U src/usr.sbin/nsd/lookup3.c C src/usr.sbin/nsd/config.h.in C src/usr.sbin/nsd/edns.c C src/usr.sbin/nsd/server.c C src/usr.sbin/nsd/util.h U src/usr.sbin/nsd/xfrd-disk.h U src/usr.sbin/nsd/nsec3.h C src/usr.sbin/nsd/configparser.y U src/usr.sbin/nsd/rbtree.c U src/usr.sbin/nsd/rrl.c U src/usr.sbin/nsd/xfrd-tcp.h U src/usr.sbin/nsd/udbzone.c C src/usr.sbin/nsd/zlexer.lex U src/usr.sbin/nsd/zonec.h C src/usr.sbin/nsd/namedb.h U src/usr.sbin/nsd/rdata.h C src/usr.sbin/nsd/configure.ac U src/usr.sbin/nsd/popen3.c U src/usr.sbin/nsd/nsd-control-setup.sh.in U src/usr.sbin/nsd/ipc.h C src/usr.sbin/nsd/acx_nlnetlabs.m4 C src/usr.sbin/nsd/remote.c C src/usr.sbin/nsd/options.c C src/usr.sbin/nsd/Makefile.in U src/usr.sbin/nsd/tsig.h U src/usr.sbin/nsd/mkinstalldirs U src/usr.sbin/nsd/nsd-mem.c C src/usr.sbin/nsd/nsd-checkconf.c C src/usr.sbin/nsd/dns.h U src/usr.sbin/nsd/xfr-inspect.c C src/usr.sbin/nsd/packet.h U src/usr.sbin/nsd/udb.h U src/usr.sbin/nsd/xfrd-notify.h U src/usr.sbin/nsd/radtree.h U src/usr.sbin/nsd/tsig-openssl.c C src/usr.sbin/nsd/configure U src/usr.sbin/nsd/bitset.h C src/usr.sbin/nsd/xfrd.h U src/usr.sbin/nsd/install-sh C src/usr.sbin/nsd/configlexer.lex C src/usr.sbin/nsd/nsd.c U src/usr.sbin/nsd/popen3.h C src/usr.sbin/nsd/edns.h U src/usr.sbin/nsd/udbzone.h U src/usr.sbin/nsd/mini_event.c U src/usr.sbin/nsd/dname.h U src/usr.sbin/nsd/remote.h C src/usr.sbin/nsd/dns.c U src/usr.sbin/nsd/netio.h U src/usr.sbin/nsd/LICENSE U src/usr.sbin/nsd/rdata.c C src/usr.sbin/nsd/difffile.c U src/usr.sbin/nsd/radtree.c U src/usr.sbin/nsd/iterated_hash.h U src/usr.sbin/nsd/rbtree.h U src/usr.sbin/nsd/tsig-openssl.h U src/usr.sbin/nsd/buffer.c U src/usr.sbin/nsd/systemd.m4 U src/usr.sbin/nsd/rrl.h U src/usr.sbin/nsd/answer.c C src/usr.sbin/nsd/zparser.y U src/usr.sbin/nsd/ipc.c U src/usr.sbin/nsd/xfrd-notify.c C src/usr.sbin/nsd/dname.c U src/usr.sbin/nsd/udb.c U src/usr.sbin/nsd/udbradtree.h U src/usr.sbin/nsd/mini_event.h U src/usr.sbin/nsd/axfr.h C src/usr.sbin/nsd/query.c C src/usr.sbin/nsd/nsd-control.8.in C src/usr.sbin/nsd/options.h C src/usr.sbin/nsd/nsd.8.in U src/usr.sbin/nsd/udbradtree.c U src/usr.sbin/nsd/netio.c C src/usr.sbin/nsd/nsd-control.c U src/usr.sbin/nsd/util.c U src/usr.sbin/nsd/region-allocator.h C src/usr.sbin/nsd/nsd-checkconf.8.in U src/usr.sbin/nsd/iterated_hash.c C src/usr.sbin/nsd/xfrd-tcp.c U src/usr.sbin/nsd/buffer.h U src/usr.sbin/nsd/xfrd-disk.c U src/usr.sbin/nsd/tsig.c U src/usr.sbin/nsd/packet.c C src/usr.sbin/nsd/nsd.conf.sample.in C src/usr.sbin/nsd/nsd-checkzone.8.in U src/usr.sbin/nsd/bitset.c C src/usr.sbin/nsd/nsd.conf.5.in U src/usr.sbin/nsd/namedb.c U src/usr.sbin/nsd/answer.h U src/usr.sbin/nsd/difffile.h C src/usr.sbin/nsd/nsd-checkzone.c U src/usr.sbin/nsd/lookup3.h U src/usr.sbin/nsd/dbaccess.c C src/usr.sbin/nsd/dbcreate.c C src/usr.sbin/nsd/doc/ChangeLog C src/usr.sbin/nsd/doc/RELNOTES C src/usr.sbin/nsd/dnstap/dnstap.h U src/usr.sbin/nsd/dnstap/dnstap_config.h.in C src/usr.sbin/nsd/dnstap/dnstap_collector.c C src/usr.sbin/nsd/dnstap/dnstap_collector.h C src/usr.sbin/nsd/dnstap/dnstap.c U src/usr.sbin/nsd/dnstap/dnstap.proto C src/usr.sbin/nsd/dnstap/dnstap.m4 47 conflicts created by this import. Use the following command to help the merge: cvs checkout -jNLNETLABS:yesterday -jNLNETLABS src/usr.sbin/nsd