CVSROOT: /cvs Module name: src Changes by: st...@cvs.openbsd.org 2022/11/14 14:09:32
Modified files:
usr.sbin/nsd : acx_nlnetlabs.m4 configparser.y configure
configure.ac difffile.c dns.h
nsd-checkconf.8.in nsd-checkconf.c
nsd-checkzone.8.in nsd-control.8.in nsd.8.in
nsd.conf.5.in rdata.c remote.c server.c
verify.c xfrd-tcp.c xfrd.c zlexer.lex zonec.c
usr.sbin/nsd/doc: ChangeLog README RELNOTES
Log message:
merge conflicts
