]> granicus.if.org Git - pdns/commitdiff
dnsdist: Rename DOH's reloadCertificate() to reloadCertificates()
authorRemi Gacogne <remi.gacogne@powerdns.com>
Wed, 17 Apr 2019 09:41:38 +0000 (11:41 +0200)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Wed, 17 Apr 2019 09:41:38 +0000 (11:41 +0200)
pdns/dnsdist-lua.cc
pdns/dnsdistdist/docs/reference/config.rst
pdns/dnsdistdist/doh.cc
pdns/doh.hh

index 723d9e2a16664fafc855b594fe0425f8e7d9eba1..03129695e20ea5487b546a6c8830b2c055d62b41 100644 (file)
@@ -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 */
           }
index 0295821ef19b7abe2c28b73baac584e7dc647036..38d57556fc271beb451d09c1d471a505eceb158a 100644 (file)
@@ -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
 ~~~~~~~~~~
index efbbdd5a2bf566f34e7bac183b067c4a6ef565ab..e6f436c41e80f19173cac6684787be5cc6a1bd63 100644 (file)
@@ -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);
index 519fa20446a7bf63aa69bf591621398cb140f448..d128e4ede88b38255a487c6782315909eaeaa9c6 100644 (file)
@@ -34,12 +34,12 @@ struct DOHFrontend
   {
   }
 
-  void reloadCertificate()
+  void reloadCertificates()
   {
   }
 #else
   void setup();
-  void reloadCertificate();
+  void reloadCertificates();
 #endif /* HAVE_DNS_OVER_HTTPS */
 };