fix Remi's comments and some formatting

diff --git a/pdns/dnsdistdist/dnsdist-lua.cc b/pdns/dnsdistdist/dnsdist-lua.cc
index 0bb509aa04c48ef96b8f4e392261898d250465db..43adf2066cd1b8afc1199d4a1f7b776663242d3d 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-lua.cc
+++ b/pdns/dnsdistdist/dnsdist-lua.cc
@@ -3002,14 +3002,14 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck)
       }
       try {
 #ifdef HAVE_DNS_OVER_TLS
-       if (frontend->tlsFrontend) {
-         frontend->tlsFrontend->loadTicketsKey(key);
-       }
+        if (frontend->tlsFrontend) {
+          frontend->tlsFrontend->loadTicketsKey(key);
+        }
 #endif /* HAVE_DNS_OVER_TLS */
 #ifdef HAVE_DNS_OVER_HTTPS
-       if (frontend->dohFrontend) {
-         frontend->dohFrontend->loadTicketsKey(key);
-       }
+        if (frontend->dohFrontend) {
+          frontend->dohFrontend->loadTicketsKey(key);
+        }
 #endif /* HAVE_DNS_OVER_HTTPS */
       }
       catch (const std::exception& e) {
@@ -3018,7 +3018,6 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck)
     }
   });
 
-
   luaCtx.registerFunction<void (std::shared_ptr<DOHFrontend>::*)(const LuaArray<std::shared_ptr<DOHResponseMapEntry>>&)>("setResponsesMap", [](const std::shared_ptr<DOHFrontend>& frontend, const LuaArray<std::shared_ptr<DOHResponseMapEntry>>& map) {
     if (frontend != nullptr) {
       auto newMap = std::make_shared<std::vector<std::shared_ptr<DOHResponseMapEntry>>>();

diff --git a/pdns/dnsdistdist/docs/reference/config.rst b/pdns/dnsdistdist/docs/reference/config.rst
index 4bdd9e32c85bb55f1191129612c5cbab0798a510..48d193ac5b8ed5c365b5603c1469a5042a3f6d23 100644 (file)
--- a/pdns/dnsdistdist/docs/reference/config.rst
+++ b/pdns/dnsdistdist/docs/reference/config.rst
@@ -2363,7 +2363,7 @@ DOHFrontend
 
   .. method:: DOHFrontend:loadTicketsKey(key)
 
-     Replace the current TLS tickets key with a given one.
+     Load a new TLS tickets key.
 
      :param str key: the new raw TLS tickets key to load.
 
@@ -2548,7 +2548,7 @@ TLSFrontend
 
   .. method:: TLSFrontend:loadTicketsKey(key)
 
-     Replace the current TLS tickets key with a given one.
+     Load a new TLS tickets key.
 
     :param str key: the new raw TLS tickets key to load.
 

diff --git a/pdns/tcpiohandler.cc b/pdns/tcpiohandler.cc
index db07add7bea81962e91d42ac67761ca12f8f7dc2..cb9d480919f1f03af2f35691c47a97cac22f7276 100644 (file)
--- a/pdns/tcpiohandler.cc
+++ b/pdns/tcpiohandler.cc
@@ -1038,9 +1038,6 @@ public:
 
     }
     catch (const std::exception& e) {
-      safe_memory_release(d_key.data, d_key.size);
-      gnutls_free(d_key.data);
-      d_key.data = nullptr;
       safe_memory_release(d_key.data, d_key.size);
       gnutls_free(d_key.data);
       d_key.data = nullptr;

diff --git a/regression-tests.dnsdist/test_TLS.py b/regression-tests.dnsdist/test_TLS.py
index f40c18cfe450138072bce8454edd07b2379c7ff2..c54f3dee410ec6260965a315ee11d58d02b78b69 100644 (file)
--- a/regression-tests.dnsdist/test_TLS.py
+++ b/regression-tests.dnsdist/test_TLS.py
@@ -555,7 +555,6 @@ class TestOpenSSLTLSTicketsKeyCallback(DNSDistTest):
         """
 
         newKey = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(80))
-        print("about to send command: `{}`".format("getTLSFrontend(0):setTicketsKey(\"{}\")".format(newKey)))
         self.sendConsoleCommand("getTLSFrontend(0):loadTicketsKey(\"{}\")".format(newKey))
         keyLen = self.sendConsoleCommand('lastKeyLen')
         self.assertEqual(int(keyLen), 80)
@@ -597,7 +596,6 @@ class TestGnuTLSTLSTicketsKeyCallback(DNSDistTest):
         """
 
         newKey = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(64))
-        print("about to send command: `{}`".format("getTLSFrontend(0):setTicketsKey(\"{}\")".format(newKey)))
         self.sendConsoleCommand("getTLSFrontend(0):loadTicketsKey(\"{}\")".format(newKey))
         keyLen = self.sendConsoleCommand('lastKeyLen')
         self.assertEqual(int(keyLen), 64)