From 0993eb5c841705e53381624c68bbec93656a3729 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Sat, 5 Jun 2021 18:57:56 +0200
Subject: [PATCH] dnsdist: remove dnsdist.* lookup fallback

---
 pdns/dnsdist-lua-vars.cc                      | 21 -------------------
 pdns/dnsdistdist/docs/reference/constants.rst |  6 ++++++
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/pdns/dnsdist-lua-vars.cc b/pdns/dnsdist-lua-vars.cc
index 9e263f7d7a..82c4a8e482 100644
--- a/pdns/dnsdist-lua-vars.cc
+++ b/pdns/dnsdist-lua-vars.cc
@@ -117,27 +117,6 @@ void setupLuaVars(LuaContext& luaCtx)
     dd.push_back({n.first, n.second});
   luaCtx.writeVariable("DNSQType", dd);
 
-  luaCtx.executeCode(R"LUA(
-    local tables = {
-      DNSQType = DNSQType,
-      DNSRCode = DNSRCode
-    }
-    local function index (table, key)
-      for tname,t in pairs(tables)
-      do
-        local val = t[key]
-        if val then
-          warnlog(string.format("access to dnsdist.%s is deprecated, please use %s.%s", key, tname, key))
-          return val
-        end
-      end
-    end
-
-    dnsdist = {}
-    setmetatable(dnsdist, { __index = index })
-    )LUA"
-  );
-
 #ifdef HAVE_DNSCRYPT
     luaCtx.writeVariable("DNSCryptExchangeVersion", std::unordered_map<string,int>{
         { "VERSION1", DNSCryptExchangeVersion::VERSION1 },
diff --git a/pdns/dnsdistdist/docs/reference/constants.rst b/pdns/dnsdistdist/docs/reference/constants.rst
index 1b1d376961..7e93e6a645 100755
--- a/pdns/dnsdistdist/docs/reference/constants.rst
+++ b/pdns/dnsdistdist/docs/reference/constants.rst
@@ -42,6 +42,9 @@ These constants represent the different `RCODEs <https://www.iana.org/assignment
 .. versionchanged:: 1.4.0
   The prefix is changed from ``dnsdist`` to ``DNSRCode``.
 
+.. versionchanged:: 1.7.0
+  The lookup fallback from ``dnsdist`` to ``DNSRCode`` was removed.
+
 - ``DNSRCode.NOERROR``
 - ``DNSRCode.FORMERR``
 - ``DNSRCode.SERVFAIL``
@@ -130,6 +133,9 @@ DNSQType
 .. versionchanged:: 1.4.0
   The prefix is changed from ``dnsdist.`` to ``DNSQType``.
 
+.. versionchanged:: 1.7.0
+  The lookup fallback from ``dnsdist`` to ``DNSQType`` was removed.
+
 All named `QTypes <https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-4>`__ are available as constants, prefixed with ``DNSQType.``, e.g.:
 
  * ``DNSQType.AAAA``
-- 
2.47.2