merge conflicts
authorsthen <sthen@openbsd.org>
Mon, 14 Nov 2022 21:09:32 +0000 (21:09 +0000)
committersthen <sthen@openbsd.org>
Mon, 14 Nov 2022 21:09:32 +0000 (21:09 +0000)
commitde04d85599998336805cbff9bf6a5b3e06bf78d2
tree0cab9b2d11275895d4b6a2012d833b29421b25f5
parent2161bcef76d3290a186548154c3077df1cc43402
merge conflicts
23 files changed:
usr.sbin/nsd/acx_nlnetlabs.m4
usr.sbin/nsd/configparser.y
usr.sbin/nsd/configure
usr.sbin/nsd/configure.ac
usr.sbin/nsd/difffile.c
usr.sbin/nsd/dns.h
usr.sbin/nsd/doc/ChangeLog
usr.sbin/nsd/doc/README
usr.sbin/nsd/doc/RELNOTES
usr.sbin/nsd/nsd-checkconf.8.in
usr.sbin/nsd/nsd-checkconf.c
usr.sbin/nsd/nsd-checkzone.8.in
usr.sbin/nsd/nsd-control.8.in
usr.sbin/nsd/nsd.8.in
usr.sbin/nsd/nsd.conf.5.in
usr.sbin/nsd/rdata.c
usr.sbin/nsd/remote.c
usr.sbin/nsd/server.c
usr.sbin/nsd/verify.c
usr.sbin/nsd/xfrd-tcp.c
usr.sbin/nsd/xfrd.c
usr.sbin/nsd/zlexer.lex
usr.sbin/nsd/zonec.c