From 16a06fd4d269f397e85fe2a907f155d7644f42a0 Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 7 Feb 2022 15:15:57 +0100
Subject: [PATCH] dnsdist: Use dnsdist::ServiceDiscovery::s_defaultDoHSVCKey in
 newServer

---
 pdns/dnsdist-lua.cc                   | 2 +-
 pdns/dnsdistdist/dnsdist-discovery.hh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index e609699261..e5b92e3303 100644
--- 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 d96777b89e..f516a9524c 100644
--- 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
   {
-- 
2.47.2