Merge pull request #6000 from rgacogne/rec-authzone-validation

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Tue, 28 Nov 2017 12:33:18 +0000 (13:33 +0100)

committer GitHub <noreply@github.com>

Tue, 28 Nov 2017 12:33:18 +0000 (13:33 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 28 Nov 2017 12:33:18 +0000 (13:33 +0100)
committer GitHub <noreply@github.com>
Tue, 28 Nov 2017 12:33:18 +0000 (13:33 +0100)
diff --cc pdns/recursordist/test-syncres_cc.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Tue, 28 Nov 2017 12:33:18 +0000 (13:33 +0100)
committer	GitHub <noreply@github.com>
	Tue, 28 Nov 2017 12:33:18 +0000 (13:33 +0100)
		1	2
pdns/recursordist/test-syncres_cc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history