From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 17 Aug 2020 09:58:47 +0000 (+0200)
Subject: Merge pull request #8623 from jonathaneen/accept_combination_delete_replace_for_rrset
X-Git-Tag: rec-4.4.0-beta1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f871816bd4bcbcdaa87ddc9dab95eb4d69266b61;p=thirdparty%2Fpdns.git

Merge pull request #8623 from jonathaneen/accept_combination_delete_replace_for_rrset

Make a combination of delete and replace for rrset possible
---

f871816bd4bcbcdaa87ddc9dab95eb4d69266b61
diff --cc pdns/ws-auth.hh
index 79f8f2f6b6,a8ffe17adc..2cd127345f
--- a/pdns/ws-auth.hh
+++ b/pdns/ws-auth.hh
@@@ -19,8 -19,10 +19,9 @@@
   * along with this program; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
 -#ifndef WS_HH
 -#define WS_HH
 +#pragma once
  #include <string>
+ #include <tuple>
  #include <map>
  #include <time.h>
  #include <pthread.h>