From 6c7cec088fc994e1f75698e6200b7a711d01b333 Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 17 Apr 2019 11:41:38 +0200
Subject: [PATCH] dnsdist: Rename DOH's reloadCertificate() to
 reloadCertificates()

---
 pdns/dnsdist-lua.cc                        | 6 +++---
 pdns/dnsdistdist/docs/reference/config.rst | 4 ++--
 pdns/dnsdistdist/doh.cc                    | 2 +-
 pdns/doh.hh                                | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index 723d9e2a1..03129695e 100644
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -1749,9 +1749,9 @@ void setupLuaConfig(bool client)
         return result;
       });
 
-    g_lua.registerFunction<void(std::shared_ptr<DOHFrontend>::*)()>("reloadCertificate", [](std::shared_ptr<DOHFrontend> frontend) {
+    g_lua.registerFunction<void(std::shared_ptr<DOHFrontend>::*)()>("reloadCertificates", [](std::shared_ptr<DOHFrontend> frontend) {
         if (frontend != nullptr) {
-          frontend->reloadCertificate();
+          frontend->reloadCertificates();
         }
       });
 
@@ -1940,7 +1940,7 @@ void setupLuaConfig(bool client)
 #endif /* HAVE_DNS_OVER_TLS */
 #ifdef HAVE_DNS_OVER_HTTPS
             if (frontend->dohFrontend) {
-              frontend->dohFrontend->reloadCertificate();
+              frontend->dohFrontend->reloadCertificates();
             }
 #endif /* HAVE_DNS_OVER_HTTPS */
           }
diff --git a/pdns/dnsdistdist/docs/reference/config.rst b/pdns/dnsdistdist/docs/reference/config.rst
index 0295821ef..38d57556f 100644
--- a/pdns/dnsdistdist/docs/reference/config.rst
+++ b/pdns/dnsdistdist/docs/reference/config.rst
@@ -1065,9 +1065,9 @@ DOHFrontend
 
   This object represents an address and port dnsdist is listening on for DNS over HTTPS queries.
 
-  .. method:: TLSContext:reloadCertificate()
+  .. method:: DOHFrontend:reloadCertificates()
 
-     Reload the current TLS certificate and key.
+     Reload the current TLS certificate and key pairs.
 
 TLSContext
 ~~~~~~~~~~
diff --git a/pdns/dnsdistdist/doh.cc b/pdns/dnsdistdist/doh.cc
index efbbdd5a2..e6f436c41 100644
--- a/pdns/dnsdistdist/doh.cc
+++ b/pdns/dnsdistdist/doh.cc
@@ -633,7 +633,7 @@ static void setupAcceptContext(DOHAcceptContext& ctx, DOHServerConfig& dsc, bool
   ctx.release();
 }
 
-void DOHFrontend::reloadCertificate()
+void DOHFrontend::reloadCertificates()
 {
   auto newAcceptContext = std::unique_ptr<DOHAcceptContext>(new DOHAcceptContext());
   setupAcceptContext(*newAcceptContext, *d_dsc, true);
diff --git a/pdns/doh.hh b/pdns/doh.hh
index 519fa2044..d128e4ede 100644
--- a/pdns/doh.hh
+++ b/pdns/doh.hh
@@ -34,12 +34,12 @@ struct DOHFrontend
   {
   }
 
-  void reloadCertificate()
+  void reloadCertificates()
   {
   }
 #else
   void setup();
-  void reloadCertificate();
+  void reloadCertificates();
 #endif /* HAVE_DNS_OVER_HTTPS */
 };
 
-- 
2.40.0