CVSROOT: /cvs
Module name: src
Changes by: [email protected] 2018/09/17 03:46:12
Modified files:
usr.sbin/unbound: Makefile.in config.h.in configure configure.ac
usr.sbin/unbound/cachedb: cachedb.c cachedb.h
usr.sbin/unbound/daemon: acl_list.c acl_list.h cachedump.c
daemon.c remote.c remote.h stats.c
unbound.c worker.c
usr.sbin/unbound/doc: Changelog README example.conf.in
libunbound.3.in unbound-anchor.8.in
unbound-checkconf.8.in
unbound-control.8.in unbound-host.1.in
unbound.8.in unbound.conf.5.in
usr.sbin/unbound/iterator: iter_delegpt.c iter_delegpt.h
iter_fwd.c iter_hints.c iter_utils.c
iter_utils.h iterator.c
usr.sbin/unbound/libunbound: context.c context.h libunbound.c
libworker.c libworker.h unbound.h
worker.h
usr.sbin/unbound/services: authzone.c authzone.h
listen_dnsport.c mesh.c
outside_network.c outside_network.h
usr.sbin/unbound/services/cache: infra.c rrset.c
usr.sbin/unbound/sldns: keyraw.c keyraw.h str2wire.c
usr.sbin/unbound/smallapp: unbound-checkconf.c unbound-control.c
unbound-host.c worker_cb.c
usr.sbin/unbound/util: alloc.c alloc.h config_file.c
config_file.h configlexer.lex
configparser.y fptr_wlist.c fptr_wlist.h
iana_ports.inc module.h net_help.c
net_help.h netevent.c tube.c ub_event.c
usr.sbin/unbound/util/data: dname.c dname.h msgparse.c
msgreply.c packed_rrset.c
packed_rrset.h
usr.sbin/unbound/validator: val_anchor.c val_anchor.h val_neg.c
val_neg.h val_secalgo.c validator.c
validator.h
Log message:
merge conflicts
