Change truncateTC to defaulting to off since it breaks compatibility with RFC6891...

diff --git a/pdns/README-dnsdist.md b/pdns/README-dnsdist.md
index 6b47f3e747c1b93d3d0dea414db643b51676f854..10b114711559bc3f9d833f6b4e58f7293c72ac58 100644 (file)
--- a/pdns/README-dnsdist.md
+++ b/pdns/README-dnsdist.md
@@ -1406,7 +1406,7 @@ instantiate a server with additional parameters
     * `addDelay(netmask, n)`: delay answers within that netmask by n milliseconds
     * `addDelay({netmask, netmask}, n)`: delay answers within those netmasks (together) by n milliseconds
  * Answer changing functions:
-    * `truncateTC(bool)`: if set (default) truncate TC=1 answers so they are actually empty. Fixes an issue for PowerDNS Authoritative Server 2.9.22.
+    * `truncateTC(bool)`: if set (default to no) truncate TC=1 answers so they are actually empty. Fixes an issue for PowerDNS Authoritative Server 2.9.22. Note: turning this on breaks compatibility with RFC 6891.
     * `fixupCase(bool)`: if set (default to no), rewrite the first qname of the question part of the answer to match the one from the query. It is only useful when you have a downstream server that messes up the case of the question qname in the answer
  * Dynamic Block related:
     * `maintenance()`: called every second by dnsdist if defined, call functions below from it

diff --git a/pdns/dnsdist-console.cc b/pdns/dnsdist-console.cc
index 45052f08db4997a28e8a44a9006a86186a6473b1..26a08e609026557142ef8a118af78eca5374c280 100644 (file)
--- a/pdns/dnsdist-console.cc
+++ b/pdns/dnsdist-console.cc
@@ -366,7 +366,7 @@ const std::vector<ConsoleKeyword> g_consoleKeywords{
   { "topResponseRule", true, "", "move the last response rule to the first position" },
   { "topRule", true, "", "move the last rule to the first position" },
   { "topSlow", true, "[top][, limit][, labels]", "show `top` queries slower than `limit` milliseconds, grouped by last `labels` labels" },
-  { "truncateTC", true, "bool", "if set (default) truncate TC=1 answers so they are actually empty. Fixes an issue for PowerDNS Authoritative Server 2.9.22" },
+  { "truncateTC", true, "bool", "if set (default to no) truncate TC=1 answers so they are actually empty. Fixes an issue for PowerDNS Authoritative Server 2.9.22. Note: turning this one breaks compatibility with RFC 6891." },
   { "unregisterDynBPFFilter", true, "DynBPFFilter", "unregister this dynamic BPF filter" },
   { "webserver", true, "address:port, password [, apiKey [, customHeaders ]])", "launch a webserver with stats on that address with that password" },
   { "whashed", false, "", "Weighted hashed ('sticky') distribution over available servers, based on the server 'weight' parameter" },

diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index a588e2c9a69f98c48e663658c67178e9e2b0c1f1..8f471c02e14733e140cb4bd555dea6f13c47985f 100644 (file)
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -136,7 +136,7 @@ int g_tcpSendTimeout{2};
 int g_udpTimeout{2};
 
 bool g_servFailOnNoPolicy{false};
-bool g_truncateTC{1};
+bool g_truncateTC{0};
 bool g_fixupCase{0};
 static void truncateTC(const char* packet, uint16_t* len)
 try