From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 29 Sep 2023 12:54:45 +0000 (+0200)
Subject: Merge pull request #13014 from jsoref/deprecated
X-Git-Tag: rec-5.0.0-alpha2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4d81a02d18a3a0b21a008fd612bdcbdfc6be6df;p=thirdparty%2Fpdns.git

Merge pull request #13014 from jsoref/deprecated

Report auth settings deprecated in 4.5
---

a4d81a02d18a3a0b21a008fd612bdcbdfc6be6df
diff --cc pdns/arguments.cc
index 1831d7d07f,35c1eb001a..3970d8cd51
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@@ -359,10 -364,16 +359,17 @@@ static const map<string, string> deprec
    {"snmp-master-socket", "snmp-daemon-socket"},
    {"xpf-allow-from", "Proxy Protocol"},
    {"xpf-rr-code", "Proxy Protocol"},
+   {"allow-unsigned-supermaster", "allow-unsigned-autoprimary"},
+   {"master", "primary"},
+   {"slave-cycle-interval", "xfr-cycle-interval"},
+   {"slave-renotify", "secondary-do-renotify"},
+   {"slave", "secondary"},
+   {"superslave", "autosecondary"},
+   {"domain-metadata-cache-ttl", "zone-metadata-cache-ttl"},
  };
  
 -void ArgvMap::warnIfDeprecated(const string& var)
 +// NOLINTNEXTLINE(readability-convert-member-functions-to-static): accesses d_log (compiled out in auth, hence clang-tidy message)
 +void ArgvMap::warnIfDeprecated(const string& var) const
  {
    const auto msg = deprecateList.find(var);
    if (msg != deprecateList.end()) {