Module name: src
Changes by: brad@cvs.openbsd.org 2014/09/16 10:54:08

Log message:
update to NSD 4.1.0, ok sthen@

Status:

Vendor Tag: NLNETLABS
Release Tags: NSD_4_1_0

U src/usr.sbin/nsd/axfr.c
C src/usr.sbin/nsd/rrl.c
U src/usr.sbin/nsd/tsig-openssl.h
U src/usr.sbin/nsd/LICENSE
U src/usr.sbin/nsd/udbzone.h
U src/usr.sbin/nsd/iterated_hash.h
U src/usr.sbin/nsd/nsec3.h
C src/usr.sbin/nsd/nsd.8.in
U src/usr.sbin/nsd/remote.h
C src/usr.sbin/nsd/server.c
U src/usr.sbin/nsd/packet.h
U src/usr.sbin/nsd/query.c
U src/usr.sbin/nsd/answer.h
U src/usr.sbin/nsd/buffer.h
U src/usr.sbin/nsd/nsd.h
C src/usr.sbin/nsd/nsec3.c
C src/usr.sbin/nsd/configure.ac
C src/usr.sbin/nsd/xfrd-tcp.c
U src/usr.sbin/nsd/zonec.h
C src/usr.sbin/nsd/xfrd-disk.c
U src/usr.sbin/nsd/remote.c
U src/usr.sbin/nsd/xfrd-tcp.h
U src/usr.sbin/nsd/udb.h
U src/usr.sbin/nsd/tsig-openssl.c
U src/usr.sbin/nsd/netio.c
C src/usr.sbin/nsd/nsd.c
U src/usr.sbin/nsd/region-allocator.h
U src/usr.sbin/nsd/axfr.h
U src/usr.sbin/nsd/tsig.c
U src/usr.sbin/nsd/nsd.conf.sample.in
U src/usr.sbin/nsd/tsig.h
C src/usr.sbin/nsd/nsd.conf.5.in
U src/usr.sbin/nsd/nsd-control.c
U src/usr.sbin/nsd/rdata.h
U src/usr.sbin/nsd/answer.c
U src/usr.sbin/nsd/xfrd.h
C src/usr.sbin/nsd/xfrd.c
U src/usr.sbin/nsd/xfrd-notify.c
C src/usr.sbin/nsd/nsd-checkconf.c
C src/usr.sbin/nsd/Makefile.in
C src/usr.sbin/nsd/configure
U src/usr.sbin/nsd/packet.c
U src/usr.sbin/nsd/radtree.h
U src/usr.sbin/nsd/rrl.h
U src/usr.sbin/nsd/mini_event.h
U src/usr.sbin/nsd/netio.h
U src/usr.sbin/nsd/configyyrename.h
U src/usr.sbin/nsd/options.h
C src/usr.sbin/nsd/configparser.y
C src/usr.sbin/nsd/dns.c
U src/usr.sbin/nsd/difffile.c
U src/usr.sbin/nsd/xfrd-disk.h
U src/usr.sbin/nsd/namedb.h
U src/usr.sbin/nsd/radtree.c
U src/usr.sbin/nsd/zlexer.lex
U src/usr.sbin/nsd/buffer.c
U src/usr.sbin/nsd/difffile.h
U src/usr.sbin/nsd/xfrd-notify.h
U src/usr.sbin/nsd/install-sh
U src/usr.sbin/nsd/dname.h
U src/usr.sbin/nsd/namedb.c
U src/usr.sbin/nsd/edns.h
U src/usr.sbin/nsd/dns.h
U src/usr.sbin/nsd/nsd-mem.c
U src/usr.sbin/nsd/ipc.h
U src/usr.sbin/nsd/rbtree.h
U src/usr.sbin/nsd/mini_event.c
U src/usr.sbin/nsd/edns.c
U src/usr.sbin/nsd/mkinstalldirs
U src/usr.sbin/nsd/nsd-control.8.in
C src/usr.sbin/nsd/dname.c
U src/usr.sbin/nsd/dbaccess.c
N src/usr.sbin/nsd/nsd-checkzone.c
U src/usr.sbin/nsd/dbcreate.c
C src/usr.sbin/nsd/util.h
U src/usr.sbin/nsd/ipc.c
C src/usr.sbin/nsd/config.h.in
U src/usr.sbin/nsd/region-allocator.c
C src/usr.sbin/nsd/lookup3.c
U src/usr.sbin/nsd/acx_nlnetlabs.m4
U src/usr.sbin/nsd/rdata.c
U src/usr.sbin/nsd/udbradtree.c
U src/usr.sbin/nsd/lookup3.h
C src/usr.sbin/nsd/zparser.y
U src/usr.sbin/nsd/udbzone.c
U src/usr.sbin/nsd/nsd-control-setup.sh.in
U src/usr.sbin/nsd/udbradtree.h
U src/usr.sbin/nsd/zonec.c
U src/usr.sbin/nsd/udb.c
U src/usr.sbin/nsd/configlexer.lex
U src/usr.sbin/nsd/options.c
U src/usr.sbin/nsd/iterated_hash.c
C src/usr.sbin/nsd/nsd-checkconf.8.in
U src/usr.sbin/nsd/query.h
C src/usr.sbin/nsd/util.c
N src/usr.sbin/nsd/nsd-checkzone.8.in
U src/usr.sbin/nsd/rbtree.c
U src/usr.sbin/nsd/compat/pselect.c
U src/usr.sbin/nsd/compat/malloc.c
U src/usr.sbin/nsd/compat/b64_pton.c
U src/usr.sbin/nsd/compat/b64_ntop.c
U src/usr.sbin/nsd/compat/strlcpy.c
U src/usr.sbin/nsd/compat/inet_pton.c
U src/usr.sbin/nsd/compat/memcmp.c
U src/usr.sbin/nsd/compat/memmove.c
U src/usr.sbin/nsd/compat/fake-rfc2553.h
U src/usr.sbin/nsd/compat/strptime.c
U src/usr.sbin/nsd/compat/strlcat.c
U src/usr.sbin/nsd/compat/snprintf.c
U src/usr.sbin/nsd/compat/fake-rfc2553.c
U src/usr.sbin/nsd/compat/inet_ntop.c
U src/usr.sbin/nsd/compat/basename.c
U src/usr.sbin/nsd/compat/inet_aton.c
U src/usr.sbin/nsd/compat/memcmp.h

22 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jNLNETLABS:yesterday -jNLNETLABS src/usr.sbin/nsd