Merge pull request #12334 from omoerbeek/rec-more-edns

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

Tue, 3 Jan 2023 10:20:26 +0000 (11:20 +0100)

committer GitHub <noreply@github.com>

Tue, 3 Jan 2023 10:20:26 +0000 (11:20 +0100)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 3 Jan 2023 10:20:26 +0000 (11:20 +0100)
committer GitHub <noreply@github.com>
Tue, 3 Jan 2023 10:20:26 +0000 (11:20 +0100)
diff --cc pdns/recursordist/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/syncres.cc
Simple merge
diff --cc pdns/recursordist/syncres.hh
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Tue, 3 Jan 2023 10:20:26 +0000 (11:20 +0100)
committer	GitHub <noreply@github.com>
	Tue, 3 Jan 2023 10:20:26 +0000 (11:20 +0100)
		1	2
pdns/recursordist/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history