Merge pull request #944 from NLnetLabs/disable-edns-do

author Wouter Wijngaards <wcawijngaards@users.noreply.github.com>

Thu, 12 Oct 2023 12:04:29 +0000 (14:04 +0200)

committer GitHub <noreply@github.com>

Thu, 12 Oct 2023 12:04:29 +0000 (14:04 +0200)
author Wouter Wijngaards <wcawijngaards@users.noreply.github.com>
Thu, 12 Oct 2023 12:04:29 +0000 (14:04 +0200)
committer GitHub <noreply@github.com>
Thu, 12 Oct 2023 12:04:29 +0000 (14:04 +0200)
diff --cc doc/example.conf.in
Simple merge
diff --cc doc/unbound.conf.5.in
Simple merge
diff --cc util/config_file.c
Simple merge
diff --cc util/config_file.h
Simple merge
diff --cc util/configlexer.lex
Simple merge
diff --cc util/configparser.y
Simple merge
author	Wouter Wijngaards <wcawijngaards@users.noreply.github.com>
	Thu, 12 Oct 2023 12:04:29 +0000 (14:04 +0200)
committer	GitHub <noreply@github.com>
	Thu, 12 Oct 2023 12:04:29 +0000 (14:04 +0200)
		1	2
doc/example.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
doc/unbound.conf.5.in	patch \|	diff1 \|	diff2 \|	blob \| history
util/config_file.c	patch \|	diff1 \|	diff2 \|	blob \| history
util/config_file.h	patch \|	diff1 \|	diff2 \|	blob \| history
util/configlexer.lex	patch \|	diff1 \|	diff2 \|	blob \| history
util/configparser.y	patch \|	diff1 \|	diff2 \|	blob \| history