From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 25 May 2022 07:45:08 +0000 (+0200)
Subject: Deprecation warning for XPF settings.
X-Git-Tag: rec-4.7.0^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F11645%2Fhead;p=thirdparty%2Fpdns.git

Deprecation warning for XPF settings.

(cherry picked from commit 7e32a0b96df460abd8fb98fbb63f4d336b9c3d03)

Backport of #11644
---

diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index 4ece63184d..c3661ff239 100644
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -355,7 +355,9 @@ static const map<string,string> deprecateList = {
   { "stats-snmp-blacklist", "stats-snmp-disabled-list" },
   { "edns-subnet-whitelist", "edns-subnet-allow-list" },
   { "new-domain-whitelist", "new-domain-ignore-list" },
-  { "snmp-master-socket", "snmp-daemon-socket" }
+  { "snmp-master-socket", "snmp-daemon-socket" },
+  { "xpf-allow-from", "Proxy Protocol" },
+  { "xpf-rr-code", "Proxy Protocol" },
 };
 
 static void warnIfDeprecated(const string& var)