Merge remote-tracking branch 'origin/master' into api-tsig-keys

diff --cc docs/http-api/swagger/authoritative-api-swagger.yaml
Simple merge

diff --cc pdns/Makefile.am
Simple merge

diff --cc pdns/pdnsutil.cc
Simple merge

diff --cc pdns/ws-auth.cc
index 52357a98ca09476bd5e1d14725ca25128816d794,ab2d1e696be247b3fc220c75e8e6cb8cd69be477..0d3080d9720a1c2653dc19376b87c699117f3dcd
--- 1/pdns/ws-auth.cc
--- 2/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@@ -2149,11 -1962,8 +2156,10 @@@ void AuthWebServer::webThread(
      if(::arg().mustDo("api")) {
        d_ws->registerApiHandler("/api/v1/servers/localhost/cache/flush", &apiServerCacheFlush);
        d_ws->registerApiHandler("/api/v1/servers/localhost/config", &apiServerConfig);
-       d_ws->registerApiHandler("/api/v1/servers/localhost/search-log", &apiServerSearchLog);
        d_ws->registerApiHandler("/api/v1/servers/localhost/search-data", &apiServerSearchData);
        d_ws->registerApiHandler("/api/v1/servers/localhost/statistics", &apiServerStatistics);
 +      d_ws->registerApiHandler("/api/v1/servers/localhost/tsigkeys/<id>", &apiServerTSIGKeyDetail);
 +      d_ws->registerApiHandler("/api/v1/servers/localhost/tsigkeys", &apiServerTSIGKeys);
        d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/axfr-retrieve", &apiServerZoneAxfrRetrieve);
        d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/cryptokeys/<key_id>", &apiZoneCryptokeys);
        d_ws->registerApiHandler("/api/v1/servers/localhost/zones/<id>/cryptokeys", &apiZoneCryptokeys);

diff --cc regression-tests.api/test_Zones.py
Simple merge