CVSROOT:        /cvs
Module name:    src
Changes by:     st...@cvs.openbsd.org   2019/09/17 10:19:02

Log message:
    import nsd 4.2.2, ok florian@
    
    Status:
    
    Vendor Tag: NLNETLABS
    Release Tags:       NSD_4_2_2
    
    C src/usr.sbin/nsd/nsec3.h
    C src/usr.sbin/nsd/udbzone.c
    C src/usr.sbin/nsd/rbtree.h
    C src/usr.sbin/nsd/udbradtree.c
    U src/usr.sbin/nsd/lookup3.h
    U src/usr.sbin/nsd/configyyrename.h
    U src/usr.sbin/nsd/tsig.h
    C src/usr.sbin/nsd/edns.h
    U src/usr.sbin/nsd/iterated_hash.c
    C src/usr.sbin/nsd/nsd.conf.5.in
    C src/usr.sbin/nsd/namedb.c
    U src/usr.sbin/nsd/answer.h
    C src/usr.sbin/nsd/difffile.h
    C src/usr.sbin/nsd/nsd-checkzone.c
    C src/usr.sbin/nsd/dbaccess.c
    C src/usr.sbin/nsd/dbcreate.c
    C src/usr.sbin/nsd/region-allocator.c
    C src/usr.sbin/nsd/dns.c
    C src/usr.sbin/nsd/xfrd.c
    C 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
    C src/usr.sbin/nsd/nsd.h
    C 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
    C src/usr.sbin/nsd/xfrd-disk.h
    C src/usr.sbin/nsd/configparser.y
    C src/usr.sbin/nsd/rbtree.c
    C src/usr.sbin/nsd/rrl.c
    C src/usr.sbin/nsd/xfrd-tcp.h
    C src/usr.sbin/nsd/zlexer.lex
    C 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
    C 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
    C src/usr.sbin/nsd/mkinstalldirs
    C src/usr.sbin/nsd/nsd-mem.c
    C src/usr.sbin/nsd/nsd-checkconf.c
    C src/usr.sbin/nsd/dns.h
    C src/usr.sbin/nsd/xfr-inspect.c
    C src/usr.sbin/nsd/packet.h
    C src/usr.sbin/nsd/udb.h
    C src/usr.sbin/nsd/xfrd-notify.h
    C src/usr.sbin/nsd/radtree.h
    C src/usr.sbin/nsd/tsig-openssl.c
    C src/usr.sbin/nsd/configure
    C src/usr.sbin/nsd/xfrd.h
    C src/usr.sbin/nsd/install-sh
    C src/usr.sbin/nsd/configlexer.lex
    C src/usr.sbin/nsd/nsd.c
    C src/usr.sbin/nsd/udbzone.h
    C src/usr.sbin/nsd/mini_event.c
    C src/usr.sbin/nsd/dname.h
    C src/usr.sbin/nsd/remote.h
    C src/usr.sbin/nsd/netio.h
    C src/usr.sbin/nsd/LICENSE
    C src/usr.sbin/nsd/rdata.c
    C src/usr.sbin/nsd/difffile.c
    C src/usr.sbin/nsd/radtree.c
    U src/usr.sbin/nsd/iterated_hash.h
    U src/usr.sbin/nsd/tsig-openssl.h
    U src/usr.sbin/nsd/buffer.c
    C src/usr.sbin/nsd/systemd.m4
    C src/usr.sbin/nsd/rrl.h
    C src/usr.sbin/nsd/ipc.c
    C src/usr.sbin/nsd/answer.c
    C src/usr.sbin/nsd/zparser.y
    C src/usr.sbin/nsd/xfrd-notify.c
    U src/usr.sbin/nsd/dname.c
    C src/usr.sbin/nsd/udb.c
    C src/usr.sbin/nsd/udbradtree.h
    C 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
    C src/usr.sbin/nsd/netio.c
    C src/usr.sbin/nsd/util.c
    C src/usr.sbin/nsd/nsd-control.c
    C src/usr.sbin/nsd/region-allocator.h
    C src/usr.sbin/nsd/nsd-checkconf.8.in
    C src/usr.sbin/nsd/xfrd-tcp.c
    C src/usr.sbin/nsd/buffer.h
    C src/usr.sbin/nsd/xfrd-disk.c
    C src/usr.sbin/nsd/tsig.c
    C src/usr.sbin/nsd/packet.c
    C src/usr.sbin/nsd/nsd.conf.sample.in
    C src/usr.sbin/nsd/nsd-checkzone.8.in
    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
    C src/usr.sbin/nsd/dnstap/dnstap.proto
    U src/usr.sbin/nsd/dnstap/dnstap.m4
    
    92 conflicts created by this import.
    Use the following command to help the merge:
    
    cvs checkout -jNLNETLABS:yesterday -jNLNETLABS src/usr.sbin/nsd

Reply via email to