]> granicus.if.org Git - pdns/commitdiff
Merge pull request #4518 from rgacogne/dnsdist-dynblock-action
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Wed, 2 Nov 2016 08:56:00 +0000 (09:56 +0100)
committerGitHub <noreply@github.com>
Wed, 2 Nov 2016 08:56:00 +0000 (09:56 +0100)
dnsdist: Fix dynblocks over TCP, allow refusing dyn blocked queries

1  2 
pdns/README-dnsdist.md
pdns/dnsdist-lua.cc
pdns/dnsdist-lua2.cc
pdns/dnsdist-tcp.cc
pdns/dnsdist.cc
pdns/dnsdist.hh

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