Merge pull request #9239 from pieterlexis/xfr-list

Auth: Add pdns_control command to the the list of XFR domains in queue

diff --cc pdns/common_startup.cc
Simple merge

diff --cc pdns/communicator.hh
Simple merge

diff --cc pdns/dynhandler.cc
Simple merge

diff --cc pdns/receiver.cc
index 6caf96898d12eeca3b0c40926bccb1167330c08a,eff859df0312bc5c10ca160d381608f8073099cd..084dfe9a5f12c743dbe5e83e905d21ad522ab95e
--- 1/pdns/receiver.cc
--- 2/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@@ -586,10 -586,11 +586,11 @@@ int main(int argc, char **argv
      DynListener::registerFunc("RESPSIZES", &DLRSizesHandler, "get histogram of response sizes");
      DynListener::registerFunc("REMOTES", &DLRemotesHandler, "get top remotes");
      DynListener::registerFunc("SET",&DLSettingsHandler, "set config variables", "<var> <value>");
 -    DynListener::registerFunc("RETRIEVE",&DLNotifyRetrieveHandler, "retrieve slave domain", "<domain>");
 -    DynListener::registerFunc("CURRENT-CONFIG",&DLCurrentConfigHandler, "retrieve the current configuration", "[diff|default]");
 +    DynListener::registerFunc("RETRIEVE",&DLNotifyRetrieveHandler, "retrieve slave domain", "<domain> [<ip>]");
 +    DynListener::registerFunc("CURRENT-CONFIG",&DLCurrentConfigHandler, "retrieve the current configuration", "[diff]");
      DynListener::registerFunc("LIST-ZONES",&DLListZones, "show list of zones", "[master|slave|native]");
      DynListener::registerFunc("TOKEN-LOGIN", &DLTokenLogin, "Login to a PKCS#11 token", "<module> <slot> <pin>");
+     DynListener::registerFunc("XFR-QUEUE", &DLSuckRequests, "Get all requests for XFR in queue");
  
      if(!::arg()["tcp-control-address"].empty()) {
        DynListener* dlTCP=new DynListener(ComboAddress(::arg()["tcp-control-address"], ::arg().asNum("tcp-control-port")));

diff --cc pdns/slavecommunicator.cc
Simple merge

diff --cc regression-tests.nobackend/counters/expected_result
Simple merge