CVSROOT: /cvs Module name: src Changes by: [email protected] 2013/11/26 05:53:58
Modified files:
usr.sbin/nsd : Makefile.bsd-wrapper Makefile.in axfr.c
config.h.in configparser.y configure
configure.ac dname.c dns.c dns.h lookup3.c
mkinstalldirs nsd-checkconf.8.in
nsd-checkconf.c nsd.8.in nsd.c nsd.conf.5.in
nsec3.c query.c rdata.c region-allocator.c
rrl.c server.c util.c util.h xfrd-disk.c
xfrd-tcp.c xfrd.c zonec.c zonec.h zparser.y
usr.sbin/nsd/compat: snprintf.c
Log message:
merge conflicts
