dnsdist: Use dnsdist::ServiceDiscovery::s_defaultDoHSVCKey in newServer

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index e609699261d4d74cc8dc189afaebcfefc7e160bf..e5b92e33035e0a444d06f008721f240f7d771df5 100644 (file)
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -603,7 +603,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck)
                          bool autoUpgrade = false;
                          bool keepAfterUpgrade = false;
                          uint32_t upgradeInterval = 3600;
-                         uint16_t upgradeDoHKey = 7;
+                         uint16_t upgradeDoHKey = dnsdist::ServiceDiscovery::s_defaultDoHSVCKey;
                          std::string upgradePool;
 
                          if (vars.count("autoUpgrade") && boost::get<bool>(vars.at("autoUpgrade"))) {

diff --git a/pdns/dnsdistdist/dnsdist-discovery.hh b/pdns/dnsdistdist/dnsdist-discovery.hh
index d96777b89e635ec1da5c58c9462b416318ce1af2..f516a9524c75a07674eb6d92fa2c17b3a73450cc 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-discovery.hh
+++ b/pdns/dnsdistdist/dnsdist-discovery.hh
@@ -50,10 +50,11 @@ public:
     dnsdist::Protocol d_protocol;
   };
 
+  static const uint16_t s_defaultDoHSVCKey;
+
 private:
   static const DNSName s_discoveryDomain;
   static const QType s_discoveryType;
-  static const uint16_t s_defaultDoHSVCKey;
 
   struct UpgradeableBackend
   {