Remove backwards compatibility code

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/pdns/recursordist/docs/lua-config/dnssec.rst b/pdns/recursordist/docs/lua-config/dnssec.rst
index 421363a4192889a61150b6c6f70126b3e4daf287..1b6106061bfd0df733ba80debc13e7cfd86ab3fd 100644 (file)
--- a/pdns/recursordist/docs/lua-config/dnssec.rst
+++ b/pdns/recursordist/docs/lua-config/dnssec.rst
@@ -23,26 +23,6 @@ This page only documents the Lua functions for DNSSEC configuration
 
   :param str name: The name in the DNS tree for which the Trust Anchors should be removed.
 
-.. function:: addDS(name, dscontent)
-
-  .. deprecated:: 4.2.0
-    Please use :func:`addTA` instead
-
-  Adds a DS record (Trust Anchor) to the configuration
-
-  :param str name: The name in the DNS tree from where this Trust Anchor should be used
-  :param str dsrecord: The DS Record content associated with ``name``
-
-.. function:: clearDS([name])
-
-  .. deprecated:: 4.2.0
-    Please use :func:`clearTA` instead
-
-  Remove Trust Anchors for a name from the list of configured trust anchors. When ``name`` is
-  not given, remove *all* trust anchors instead.
-
-  :param str name: The name in the DNS tree for which the Trust Anchors should be removed.
-
 .. function:: addNTA(name[, reason])
 
   .. versionadded:: 5.1.0 Alternative equivalent YAML setting: :ref:`setting-yaml-dnssec.negative_trustanchors`.

diff --git a/pdns/recursordist/docs/lua-config/rpz.rst b/pdns/recursordist/docs/lua-config/rpz.rst
index 61fd6fc8fa4a2a31e42f702fe92288fc81923aeb..c4450f0d0444d44053f676a3dbaeb02f7be83e7a 100644 (file)
--- a/pdns/recursordist/docs/lua-config/rpz.rst
+++ b/pdns/recursordist/docs/lua-config/rpz.rst
@@ -43,9 +43,6 @@ To transfer from a primary and start IXFR to get updates, use for example:
 
 In this example, 'policy.rpz' denotes the name of the zone to query for.
 
-.. note:: In versions before 4.5.0, ``rpzPrimary`` is called ``rpzMaster``. For backwards compatibility, version 4.5.0 does support ``rpzMaster`` as a synonym for ``rpzPrimary``.
-
-
 The action to be taken on a match is defined by the zone itself, but in some cases it might be interesting to be able to override it, and always apply the same action
 regardless of the one specified in the RPZ zone. To load from file and override the default action with a custom CNAME to badserver.example.com., use for example:
 

diff --git a/pdns/recursordist/rec-lua-conf.cc b/pdns/recursordist/rec-lua-conf.cc
index d8a092a79e4e875639f745e214076b851cc530ee..536c57b60327edc280cf8566345dc9c721d3e9fa 100644 (file)
--- a/pdns/recursordist/rec-lua-conf.cc
+++ b/pdns/recursordist/rec-lua-conf.cc
@@ -419,10 +419,6 @@ void loadRecursorLuaConfig(const std::string& fname, ProxyMapping& proxyMapping,
     lci.rpzs.emplace_back(params);
   });
 
-  Lua->writeFunction("rpzMaster", [&lci](const boost::variant<string, std::vector<std::pair<int, string>>>& primaries_, const string& zoneName, const boost::optional<rpzOptions_t>& options) {
-    lci.d_slog->info(Logr::Warning, "'rpzMaster' is deprecated and will be removed in a future release, use 'rpzPrimary' instead");
-    rpzPrimary(lci, primaries_, zoneName, options);
-  });
   Lua->writeFunction("rpzPrimary", [&lci](const boost::variant<string, std::vector<std::pair<int, string>>>& primaries_, const string& zoneName, const boost::optional<rpzOptions_t>& options) {
     rpzPrimary(lci, primaries_, zoneName, options);
   });
@@ -554,23 +550,6 @@ void loadRecursorLuaConfig(const std::string& fname, ProxyMapping& proxyMapping,
       lci.dsAnchors.clear();
   });
 
-  /* Remove in 4.3 */
-  Lua->writeFunction("addDS", [&lci](const std::string& who, const std::string& what) {
-    lci.d_slog->info(Logr::Warning, "addDS is deprecated and will be removed in the future, switch to addTA");
-    DNSName zone(who);
-    auto ds = std::dynamic_pointer_cast<DSRecordContent>(DSRecordContent::make(what));
-    lci.dsAnchors[zone].insert(*ds);
-  });
-
-  /* Remove in 4.3 */
-  Lua->writeFunction("clearDS", [&lci](boost::optional<string> who) {
-    lci.d_slog->info(Logr::Warning, "clearDS is deprecated and will be removed in the future, switch to clearTA");
-    if (who)
-      lci.dsAnchors.erase(DNSName(*who));
-    else
-      lci.dsAnchors.clear();
-  });
-
   Lua->writeFunction("addNTA", [&lci](const std::string& who, const boost::optional<std::string> why) {
     if (why)
       lci.negAnchors[DNSName(who)] = static_cast<string>(*why);