From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 8 Oct 2018 08:59:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into api-tsig-keys
X-Git-Tag: auth-4.2.0-alpha1~17^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65f51e778f7fd289c9cded27452c48378b64eb8b;p=thirdparty%2Fpdns.git

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

65f51e778f7fd289c9cded27452c48378b64eb8b
diff --cc docs/http-api/index.rst
index 463c2c93ba,91b4bc0c76..55cf9bcc90
--- a/docs/http-api/index.rst
+++ b/docs/http-api/index.rst
@@@ -93,6 -101,6 +93,7 @@@ The API exposes several endpoints and o
    zone
    cryptokey
    metadata
 +  tsigkey
    search
    statistics
+   cache
diff --cc docs/http-api/swagger/authoritative-api-swagger.yaml
index 056794667f,6d02121875..a5e33641c6
--- a/docs/http-api/swagger/authoritative-api-swagger.yaml
+++ b/docs/http-api/swagger/authoritative-api-swagger.yaml
@@@ -1250,16 -1114,13 +1281,27 @@@ definitions
          type: integer
          description: 'The size of the key'
  
 +  Error:
 +    title: Error
 +    descripton: 'Returned when the server encounters an error. Either in client input or internally'
 +    properties:
 +      error:
 +        type: string
 +        description: 'A human readable error message'
 +        required: true
 +      errors:
 +        type: array
 +        items:
 +          type: string
 +        description: 'Optional array of multiple errors encountered during processing'
++
+   CacheFlushResult:
+     title: CacheFlushResult
+     description: 'The result of a cache-flush'
+     properties:
+       count:
+         type: number
+         description: 'Amount of entries flushed'
+       result:
+         type: string
+         description: 'A message about the result like "Flushed cache"'
diff --cc pdns/Makefile.am
index 8cdfb40f76,9304dcd61d..61584983b7
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@@ -223,8 -218,8 +218,9 @@@ pdns_server_SOURCES = 
  	statbag.cc statbag.hh \
  	stubresolver.cc stubresolver.hh \
  	tcpreceiver.cc tcpreceiver.hh \
+ 	threadname.hh threadname.cc \
  	tsigverifier.cc tsigverifier.hh \
 +	tsigutils.hh tsigutils.cc \
  	tkey.cc \
  	ueberbackend.cc ueberbackend.hh \
  	unix_semaphore.cc \
@@@ -338,7 -328,7 +329,8 @@@ pdnsutil_SOURCES = 
  	sstuff.hh \
  	statbag.cc \
  	stubresolver.cc stubresolver.hh \
+ 	threadname.hh threadname.cc \
 +	tsigutils.hh tsigutils.cc \
  	ueberbackend.cc \
  	unix_utility.cc \
  	zoneparser-tng.cc
diff --cc pdns/ws-auth.cc
index c274312763,e025d2b434..52357a98ca
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@@ -45,7 -44,7 +45,8 @@@
  #include "zoneparser-tng.hh"
  #include "common_startup.hh"
  #include "auth-caches.hh"
+ #include "threadname.hh"
 +#include "tsigutils.hh"
  
  using json11::Json;