From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 15 Oct 2019 18:14:11 +0000 (+0200)
Subject: dnsdist: Fix merge issue (d_ticketsKeyRotationDelay)
X-Git-Tag: dnsdist-1.4.0-rc4~19^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e8edbe93e7c4d133bf1cf30986e4104608af761;p=pdns

dnsdist: Fix merge issue (d_ticketsKeyRotationDelay)

d_ticketsKeyRotationDelay is now in the TLSConfig object.
---

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index a5d9b27f3..6c492322e 100644
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -1828,7 +1828,7 @@ void setupLuaConfig(bool client)
           ret << (fmt % "#" % "Address" % "HTTP" % "HTTP/1" % "HTTP/2" % "GET" % "POST" % "Bad" % "Errors" % "Redirects" % "Valid" % "# ticket keys" % "Rotation delay" % "Next rotation") << endl;
           size_t counter = 0;
           for (const auto& ctx : g_dohlocals) {
-            ret << (fmt % counter % ctx->d_local.toStringWithPort() % ctx->d_httpconnects % ctx->d_http1Stats.d_nbQueries % ctx->d_http1Stats.d_nbQueries % ctx->d_getqueries % ctx->d_postqueries % ctx->d_badrequests % ctx->d_errorresponses % ctx->d_redirectresponses % ctx->d_validresponses % ctx->getTicketsKeysCount() % ctx->d_ticketsKeyRotationDelay % ctx->getNextTicketsKeyRotation()) << endl;
+            ret << (fmt % counter % ctx->d_local.toStringWithPort() % ctx->d_httpconnects % ctx->d_http1Stats.d_nbQueries % ctx->d_http1Stats.d_nbQueries % ctx->d_getqueries % ctx->d_postqueries % ctx->d_badrequests % ctx->d_errorresponses % ctx->d_redirectresponses % ctx->d_validresponses % ctx->getTicketsKeysCount() % ctx->d_tlsConfig.d_ticketsKeyRotationDelay % ctx->getNextTicketsKeyRotation()) << endl;
             counter++;
           }
           g_outputBuffer = ret.str();