Merge pull request #11907 from fredmorcos/fred/9435-recursor-config-check

author Fred Morcos <fred.morcos@open-xchange.com>

Mon, 12 Sep 2022 08:08:58 +0000 (10:08 +0200)

committer GitHub <noreply@github.com>

Mon, 12 Sep 2022 08:08:58 +0000 (10:08 +0200)
author Fred Morcos <fred.morcos@open-xchange.com>
Mon, 12 Sep 2022 08:08:58 +0000 (10:08 +0200)
committer GitHub <noreply@github.com>
Mon, 12 Sep 2022 08:08:58 +0000 (10:08 +0200)
diff --cc pdns/recursordist/Makefile.am
Simple merge
diff --cc pdns/recursordist/rec-main.cc
Simple merge
author	Fred Morcos <fred.morcos@open-xchange.com>
	Mon, 12 Sep 2022 08:08:58 +0000 (10:08 +0200)
committer	GitHub <noreply@github.com>
	Mon, 12 Sep 2022 08:08:58 +0000 (10:08 +0200)
		1	2
pdns/recursordist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/rec-main.cc	patch \|	diff1 \|	diff2 \|	blob \| history