Merge pull request #9468 from omoerbeek/rec-control-pass-fd

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Tue, 16 Feb 2021 12:27:27 +0000 (13:27 +0100)

committer GitHub <noreply@github.com>

Tue, 16 Feb 2021 12:27:27 +0000 (13:27 +0100)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 16 Feb 2021 12:27:27 +0000 (13:27 +0100)
committer GitHub <noreply@github.com>
Tue, 16 Feb 2021 12:27:27 +0000 (13:27 +0100)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Tue, 16 Feb 2021 12:27:27 +0000 (13:27 +0100)
committer	GitHub <noreply@github.com>
	Tue, 16 Feb 2021 12:27:27 +0000 (13:27 +0100)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history