From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 16 Nov 2018 14:09:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into api-tsig-keys
X-Git-Tag: auth-4.2.0-alpha1~17^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12f02a2f7cc0ea36057b7d0dc87a84d4d90069fa;p=thirdparty%2Fpdns.git

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

12f02a2f7cc0ea36057b7d0dc87a84d4d90069fa
diff --cc pdns/ws-auth.cc
index 52357a98ca,ab2d1e696b..0d3080d972
--- a/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);