Merge pull request #6399 from rgacogne/dnsdist-console-acl

dnsdist: Restrict remote connection to the console via an ACL

diff --cc pdns/dnsdist-console.cc
Simple merge

diff --cc pdns/dnsdist.cc
Simple merge

diff --cc pdns/dnsdist.hh
Simple merge

diff --cc pdns/dnsdistdist/Makefile.am
index 9bb3d147e79a4a49e1f8c94fac02d10a0201faf5,7467ab509d2d45f384013873275e7746ce34daf1..3089bed9a6353ed3bf6391b69ccb04d6a0bc2951
--- 1/pdns/dnsdistdist/Makefile.am
--- 2/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@@ -86,9 -86,8 +86,9 @@@ dnsdist_SOURCES = 
        dnsdist-dynbpf.cc dnsdist-dynbpf.hh \
        dnsdist-cache.cc dnsdist-cache.hh \
        dnsdist-carbon.cc \
-       dnsdist-console.cc \
+       dnsdist-console.cc dnsdist-console.hh \
        dnsdist-dnscrypt.cc \
 +      dnsdist-dynblocks.hh \
        dnsdist-ecs.cc dnsdist-ecs.hh \
        dnsdist-lua.hh dnsdist-lua.cc \
        dnsdist-lua-actions.cc \

diff --cc pdns/dnsdistdist/docs/reference/config.rst
Simple merge