From a725879238540d73c8e782f7bb3101de8a90459d Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 15 Nov 2021 16:28:58 +0100
Subject: [PATCH] auth 2136: apply new TTL to whole RRset, not only to the
 added record

fixes #10921
---
 pdns/rfc2136handler.cc                                 | 10 ++++++----
 .../tests/1dyndns-update-add-delete-mx/expected_result |  8 ++++----
 .../1dyndns-update-delete-mx-prio/expected_result      |  4 ++--
 .../tests/1dyndns-update-replace-mx/expected_result    |  2 +-
 .../tests/1dyndns-update-srv/expected_result           |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc
index be1d3aa521..ea985b35c0 100644
--- a/pdns/rfc2136handler.cc
+++ b/pdns/rfc2136handler.cc
@@ -194,8 +194,10 @@ uint PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *rr,
         for (auto& i : rrset) {
           string icontent = i.getZoneRepresentation();
           if (lowerCase) icontent = toLower(icontent);
-          if (rrType == i.qtype.getCode() && icontent == content) {
-            foundRecord=true;
+          if (rrType == i.qtype.getCode()) {
+            if (icontent == content) {
+              foundRecord=true;
+            }
             if (i.ttl != rr->d_ttl)  {
               i.ttl = rr->d_ttl;
               updateTTL++;
@@ -204,10 +206,10 @@ uint PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *rr,
         }
         if (updateTTL > 0) {
           di->backend->replaceRRSet(di->id, rr->d_name, rrType, rrset);
-          g_log<<Logger::Notice<<msgPrefix<<"Replacing record "<<rr->d_name<<"|"<<rrType.toString()<<endl;
+          g_log<<Logger::Notice<<msgPrefix<<"Updating TTLs for "<<rr->d_name<<"|"<<rrType.toString()<<endl;
           changedRecords += updateTTL;
         } else {
-          g_log<<Logger::Notice<<msgPrefix<<"Replace for record "<<rr->d_name<<"|"<<rrType.toString()<<" requested, but no changes made."<<endl;
+          g_log<<Logger::Notice<<msgPrefix<<"Replace for recordset "<<rr->d_name<<"|"<<rrType.toString()<<" requested, but no changes made."<<endl;
         }
       }
 
diff --git a/regression-tests/tests/1dyndns-update-add-delete-mx/expected_result b/regression-tests/tests/1dyndns-update-add-delete-mx/expected_result
index cc504a9794..c25d426d07 100644
--- a/regression-tests/tests/1dyndns-update-add-delete-mx/expected_result
+++ b/regression-tests/tests/1dyndns-update-add-delete-mx/expected_result
@@ -10,9 +10,9 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.			IN	SOA
 
+0	test.dyndns.	IN	MX	3000	10 host-1.test.dyndns.
+0	test.dyndns.	IN	MX	3000	20 host-2.test.dyndns.
 0	test.dyndns.	IN	MX	3000	30 host-3.test.dyndns.
-0	test.dyndns.	IN	MX	3600	10 host-1.test.dyndns.
-0	test.dyndns.	IN	MX	3600	20 host-2.test.dyndns.
 2	host-1.test.dyndns.	IN	A	3600	127.0.0.101
 2	host-2.test.dyndns.	IN	A	3600	127.0.0.102
 2	host-3.test.dyndns.	IN	A	3600	127.0.0.103
@@ -24,8 +24,8 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.			IN	SOA
 
-0	test.dyndns.	IN	MX	3600	10 host-1.test.dyndns.
-0	test.dyndns.	IN	MX	3600	20 host-2.test.dyndns.
+0	test.dyndns.	IN	MX	3000	10 host-1.test.dyndns.
+0	test.dyndns.	IN	MX	3000	20 host-2.test.dyndns.
 2	host-1.test.dyndns.	IN	A	3600	127.0.0.101
 2	host-2.test.dyndns.	IN	A	3600	127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
diff --git a/regression-tests/tests/1dyndns-update-delete-mx-prio/expected_result b/regression-tests/tests/1dyndns-update-delete-mx-prio/expected_result
index 07509ebed4..d31c55603b 100644
--- a/regression-tests/tests/1dyndns-update-delete-mx-prio/expected_result
+++ b/regression-tests/tests/1dyndns-update-delete-mx-prio/expected_result
@@ -1,5 +1,5 @@
-0	test.dyndns.	IN	MX	3600	10 host-1.test.dyndns.
-0	test.dyndns.	IN	MX	3600	20 host-2.test.dyndns.
+0	test.dyndns.	IN	MX	3000	10 host-1.test.dyndns.
+0	test.dyndns.	IN	MX	3000	20 host-2.test.dyndns.
 2	host-1.test.dyndns.	IN	A	3600	127.0.0.101
 2	host-2.test.dyndns.	IN	A	3600	127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
diff --git a/regression-tests/tests/1dyndns-update-replace-mx/expected_result b/regression-tests/tests/1dyndns-update-replace-mx/expected_result
index 93bef4c580..e14d411ef6 100644
--- a/regression-tests/tests/1dyndns-update-replace-mx/expected_result
+++ b/regression-tests/tests/1dyndns-update-replace-mx/expected_result
@@ -11,7 +11,7 @@ Answer:
 ;test.dyndns.			IN	SOA
 
 0	test.dyndns.	IN	MX	3000	10 host-1.test.dyndns.
-0	test.dyndns.	IN	MX	3600	20 host-2.test.dyndns.
+0	test.dyndns.	IN	MX	3000	20 host-2.test.dyndns.
 2	host-1.test.dyndns.	IN	A	3600	127.0.0.101
 2	host-2.test.dyndns.	IN	A	3600	127.0.0.102
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
diff --git a/regression-tests/tests/1dyndns-update-srv/expected_result b/regression-tests/tests/1dyndns-update-srv/expected_result
index 0738f8dbf4..f2032dd7fb 100644
--- a/regression-tests/tests/1dyndns-update-srv/expected_result
+++ b/regression-tests/tests/1dyndns-update-srv/expected_result
@@ -16,8 +16,8 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.			IN	SOA
 
-0	srv.test.dyndns.	IN	SRV	3600	1 100 389 server2.
 0	srv.test.dyndns.	IN	SRV	3601	0 100 389 server1.
+0	srv.test.dyndns.	IN	SRV	3601	1 100 389 server2.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='srv.test.dyndns.', qtype=SRV
 1	test.dyndns.	IN	SOA	3600	ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-- 
2.47.2