CVSROOT: /cvs Module name: src Changes by: ja...@cvs.openbsd.org 2012/01/29 04:15:43
Log message: NSD v3.2.9 Status: Vendor Tag: NLNETLABS Release Tags: NSD_3_2_9 U src/usr.sbin/nsd/options.h U src/usr.sbin/nsd/configparser.y U src/usr.sbin/nsd/nsd.conf.sample.in U src/usr.sbin/nsd/iterated_hash.h C src/usr.sbin/nsd/nsd-patch.8.in U src/usr.sbin/nsd/difffile.c U src/usr.sbin/nsd/xfrd-notify.c U src/usr.sbin/nsd/packet.h U src/usr.sbin/nsd/region-allocator.c U src/usr.sbin/nsd/xfrd-disk.c C src/usr.sbin/nsd/dns.h C src/usr.sbin/nsd/configure.ac U src/usr.sbin/nsd/zonec.h C src/usr.sbin/nsd/nsdc.8.in U src/usr.sbin/nsd/acx_nlnetlabs.m4 C src/usr.sbin/nsd/nsd-notify.8.in C src/usr.sbin/nsd/query.c U src/usr.sbin/nsd/zparser.y U src/usr.sbin/nsd/answer.h U src/usr.sbin/nsd/xfrd.c C src/usr.sbin/nsd/nsd-xfer.8.in U src/usr.sbin/nsd/rbtree.c U src/usr.sbin/nsd/xfrd-disk.h U src/usr.sbin/nsd/nsd.h U src/usr.sbin/nsd/nsd-xfer.c U src/usr.sbin/nsd/tsig-openssl.h U src/usr.sbin/nsd/edns.h U src/usr.sbin/nsd/buffer.h C src/usr.sbin/nsd/dname.c U src/usr.sbin/nsd/query.h U src/usr.sbin/nsd/tsig.c U src/usr.sbin/nsd/buffer.c U src/usr.sbin/nsd/axfr.h U src/usr.sbin/nsd/dbaccess.c U src/usr.sbin/nsd/dname.h U src/usr.sbin/nsd/region-allocator.h U src/usr.sbin/nsd/nsec3.h U src/usr.sbin/nsd/edns.c U src/usr.sbin/nsd/xfrd-notify.h U src/usr.sbin/nsd/netio.c U src/usr.sbin/nsd/dns.c U src/usr.sbin/nsd/tsig-openssl.c U src/usr.sbin/nsd/zlexer.lex U src/usr.sbin/nsd/configlexer.lex U src/usr.sbin/nsd/difffile.h C src/usr.sbin/nsd/nsd.conf.5.in U src/usr.sbin/nsd/options.c U src/usr.sbin/nsd/dbcreate.c U src/usr.sbin/nsd/ipc.h U src/usr.sbin/nsd/rdata.h U src/usr.sbin/nsd/namedb.c C src/usr.sbin/nsd/configure C src/usr.sbin/nsd/nsd-checkconf.c U src/usr.sbin/nsd/configyyrename.h U src/usr.sbin/nsd/axfr.c U src/usr.sbin/nsd/LICENSE C src/usr.sbin/nsd/nsec3.c U src/usr.sbin/nsd/netio.h U src/usr.sbin/nsd/xfrd-tcp.c C src/usr.sbin/nsd/rdata.c C src/usr.sbin/nsd/zonec.c C src/usr.sbin/nsd/nsdc.sh.in U src/usr.sbin/nsd/namedb.h C src/usr.sbin/nsd/server.c U src/usr.sbin/nsd/nsd-notify.c U src/usr.sbin/nsd/xfrd.h U src/usr.sbin/nsd/packet.c C src/usr.sbin/nsd/nsd-checkconf.8.in U src/usr.sbin/nsd/xfrd-tcp.h U src/usr.sbin/nsd/install-sh C src/usr.sbin/nsd/nsd.c U src/usr.sbin/nsd/mkinstalldirs U src/usr.sbin/nsd/util.c U src/usr.sbin/nsd/util.h U src/usr.sbin/nsd/ipc.c U src/usr.sbin/nsd/nsd-patch.c C src/usr.sbin/nsd/nsd.8.in U src/usr.sbin/nsd/answer.c U src/usr.sbin/nsd/rbtree.h C src/usr.sbin/nsd/config.h.in U src/usr.sbin/nsd/iterated_hash.c C src/usr.sbin/nsd/zonec.8.in U src/usr.sbin/nsd/Makefile.in U src/usr.sbin/nsd/tsig.h U src/usr.sbin/nsd/compat/fake-rfc2553.h U src/usr.sbin/nsd/compat/fake-rfc2553.c U src/usr.sbin/nsd/compat/b64_pton.c U src/usr.sbin/nsd/compat/strptime.c U src/usr.sbin/nsd/compat/inet_aton.c U src/usr.sbin/nsd/compat/b64_ntop.c U src/usr.sbin/nsd/compat/strlcat.c U src/usr.sbin/nsd/compat/malloc.c U src/usr.sbin/nsd/compat/inet_pton.c U src/usr.sbin/nsd/compat/memmove.c U src/usr.sbin/nsd/compat/basename.c U src/usr.sbin/nsd/compat/memcmp.c U src/usr.sbin/nsd/compat/inet_ntop.c U src/usr.sbin/nsd/compat/strlcpy.c U src/usr.sbin/nsd/compat/pselect.c U src/usr.sbin/nsd/compat/snprintf.c 21 conflicts created by this import. Use the following command to help the merge: cvs checkout -jNLNETLABS:yesterday -jNLNETLABS src/usr.sbin/nsd