artulab.com Git - openbsd/commit

author	sthen <sthen@openbsd.org>
	Mon, 17 Sep 2018 09:46:12 +0000 (09:46 +0000)
committer	sthen <sthen@openbsd.org>
	Mon, 17 Sep 2018 09:46:12 +0000 (09:46 +0000)
commit	20237c5596ac37c947fe7dc6b504ad5cf4d698eb
tree	658beab9d39c73edf6089912574577fe1e0a9a55	tree \| snapshot
parent	712b2f300c854afbcde4b11834961322e3c11161	commit \| diff

merge conflicts

82 files changed:

usr.sbin/unbound/Makefile.in		diff \| blob \| history
usr.sbin/unbound/cachedb/cachedb.c		diff \| blob \| history
usr.sbin/unbound/cachedb/cachedb.h		diff \| blob \| history
usr.sbin/unbound/config.h.in		diff \| blob \| history
usr.sbin/unbound/configure		diff \| blob \| history
usr.sbin/unbound/configure.ac		diff \| blob \| history
usr.sbin/unbound/daemon/acl_list.c		diff \| blob \| history
usr.sbin/unbound/daemon/acl_list.h		diff \| blob \| history
usr.sbin/unbound/daemon/cachedump.c		diff \| blob \| history
usr.sbin/unbound/daemon/daemon.c		diff \| blob \| history
usr.sbin/unbound/daemon/remote.c		diff \| blob \| history
usr.sbin/unbound/daemon/remote.h		diff \| blob \| history
usr.sbin/unbound/daemon/stats.c		diff \| blob \| history
usr.sbin/unbound/daemon/unbound.c		diff \| blob \| history
usr.sbin/unbound/daemon/worker.c		diff \| blob \| history
usr.sbin/unbound/doc/Changelog		diff \| blob \| history
usr.sbin/unbound/doc/README		diff \| blob \| history
usr.sbin/unbound/doc/example.conf.in		diff \| blob \| history
usr.sbin/unbound/doc/libunbound.3.in		diff \| blob \| history
usr.sbin/unbound/doc/unbound-anchor.8.in		diff \| blob \| history
usr.sbin/unbound/doc/unbound-checkconf.8.in		diff \| blob \| history
usr.sbin/unbound/doc/unbound-control.8.in		diff \| blob \| history
usr.sbin/unbound/doc/unbound-host.1.in		diff \| blob \| history
usr.sbin/unbound/doc/unbound.8.in		diff \| blob \| history
usr.sbin/unbound/doc/unbound.conf.5.in		diff \| blob \| history
usr.sbin/unbound/iterator/iter_delegpt.c		diff \| blob \| history
usr.sbin/unbound/iterator/iter_delegpt.h		diff \| blob \| history
usr.sbin/unbound/iterator/iter_fwd.c		diff \| blob \| history
usr.sbin/unbound/iterator/iter_hints.c		diff \| blob \| history
usr.sbin/unbound/iterator/iter_utils.c		diff \| blob \| history
usr.sbin/unbound/iterator/iter_utils.h		diff \| blob \| history
usr.sbin/unbound/iterator/iterator.c		diff \| blob \| history
usr.sbin/unbound/libunbound/context.c		diff \| blob \| history
usr.sbin/unbound/libunbound/context.h		diff \| blob \| history
usr.sbin/unbound/libunbound/libunbound.c		diff \| blob \| history
usr.sbin/unbound/libunbound/libworker.c		diff \| blob \| history
usr.sbin/unbound/libunbound/libworker.h		diff \| blob \| history
usr.sbin/unbound/libunbound/unbound.h		diff \| blob \| history
usr.sbin/unbound/libunbound/worker.h		diff \| blob \| history
usr.sbin/unbound/services/authzone.c		diff \| blob \| history
usr.sbin/unbound/services/authzone.h		diff \| blob \| history
usr.sbin/unbound/services/cache/infra.c		diff \| blob \| history
usr.sbin/unbound/services/cache/rrset.c		diff \| blob \| history
usr.sbin/unbound/services/listen_dnsport.c		diff \| blob \| history
usr.sbin/unbound/services/mesh.c		diff \| blob \| history
usr.sbin/unbound/services/outside_network.c		diff \| blob \| history
usr.sbin/unbound/services/outside_network.h		diff \| blob \| history
usr.sbin/unbound/sldns/keyraw.c		diff \| blob \| history
usr.sbin/unbound/sldns/keyraw.h		diff \| blob \| history
usr.sbin/unbound/sldns/str2wire.c		diff \| blob \| history
usr.sbin/unbound/smallapp/unbound-checkconf.c		diff \| blob \| history
usr.sbin/unbound/smallapp/unbound-control.c		diff \| blob \| history
usr.sbin/unbound/smallapp/unbound-host.c		diff \| blob \| history
usr.sbin/unbound/smallapp/worker_cb.c		diff \| blob \| history
usr.sbin/unbound/util/alloc.c		diff \| blob \| history
usr.sbin/unbound/util/alloc.h		diff \| blob \| history
usr.sbin/unbound/util/config_file.c		diff \| blob \| history
usr.sbin/unbound/util/config_file.h		diff \| blob \| history
usr.sbin/unbound/util/configlexer.lex		diff \| blob \| history
usr.sbin/unbound/util/configparser.y		diff \| blob \| history
usr.sbin/unbound/util/data/dname.c		diff \| blob \| history
usr.sbin/unbound/util/data/dname.h		diff \| blob \| history
usr.sbin/unbound/util/data/msgparse.c		diff \| blob \| history
usr.sbin/unbound/util/data/msgreply.c		diff \| blob \| history
usr.sbin/unbound/util/data/packed_rrset.c		diff \| blob \| history
usr.sbin/unbound/util/data/packed_rrset.h		diff \| blob \| history
usr.sbin/unbound/util/fptr_wlist.c		diff \| blob \| history
usr.sbin/unbound/util/fptr_wlist.h		diff \| blob \| history
usr.sbin/unbound/util/iana_ports.inc		diff \| blob \| history
usr.sbin/unbound/util/module.h		diff \| blob \| history
usr.sbin/unbound/util/net_help.c		diff \| blob \| history
usr.sbin/unbound/util/net_help.h		diff \| blob \| history
usr.sbin/unbound/util/netevent.c		diff \| blob \| history
usr.sbin/unbound/util/tube.c		diff \| blob \| history
usr.sbin/unbound/util/ub_event.c		diff \| blob \| history
usr.sbin/unbound/validator/val_anchor.c		diff \| blob \| history
usr.sbin/unbound/validator/val_anchor.h		diff \| blob \| history
usr.sbin/unbound/validator/val_neg.c		diff \| blob \| history
usr.sbin/unbound/validator/val_neg.h		diff \| blob \| history
usr.sbin/unbound/validator/val_secalgo.c		diff \| blob \| history
usr.sbin/unbound/validator/validator.c		diff \| blob \| history
usr.sbin/unbound/validator/validator.h		diff \| blob \| history

OpenBSD src

RSS Atom

by Ahmet Artu Yildirim