Merge pull request #8166 from Habbie/backport-8164-to-auth-4.2.x

auth 4.2.x: pdnsutil increase-serial: set right ordername
PowerDNS · Aug 7, 2019 · a01ad28 · a01ad28
2 parents e12f2b3 + a7a3c26
commit a01ad28
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 2 deletions.
diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
@@ -679,9 +679,9 @@ int increaseSerial(const DNSName& zone, DNSSECKeeper &dk)
     DNSName ordername;
     if(haveNSEC3) {
       if(!narrow)
-        ordername=DNSName(toBase32Hex(hashQNameWithSalt(ns3pr, zone))) + zone;
+        ordername=DNSName(toBase32Hex(hashQNameWithSalt(ns3pr, zone)));
     } else
-      ordername=zone;
+      ordername=DNSName("");
     if(g_verbose)
       cerr<<"'"<<rr.qname<<"' -> '"<< ordername <<"'"<<endl;
     sd.db->updateDNSSECOrderNameAndAuth(sd.domain_id, rr.qname, ordername, true);

diff --git a/regression-tests/tests/pdnsutil-increase-serial/command b/regression-tests/tests/pdnsutil-increase-serial/command
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+mysqldiff
+
+$PDNSUTIL --config-dir=. --config-name=gmysql increase-serial test.dyndns
+
+mysqldiff 1 "Check that test.dyndns. still has a valid ordername"
+
+[ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest
+[ -z "$GMYSQLUSER" ] && GMYSQLUSER=root
+[ -z "$GMYSQLHOST" ] && GMYSQLHOST=localhost
+[ -z "$GMYSQLPASSWD" ] && GMYSQLPASSWD=''
+
+mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \
+		"$GMYSQLDB" \
+		-e "UPDATE records SET content='ns1.test.dyndns ahu.example.dyndns 2012060701 28800 7200 604800 86400' WHERE name='test.dyndns' AND type='SOA'"
diff --git a/regression-tests/tests/pdnsutil-increase-serial/description b/regression-tests/tests/pdnsutil-increase-serial/description
@@ -0,0 +1 @@
+Make sure that pdnsutil increase-serial does not destroy ordername.
diff --git a/regression-tests/tests/pdnsutil-increase-serial/expected_result b/regression-tests/tests/pdnsutil-increase-serial/expected_result
@@ -0,0 +1,6 @@
+SOA serial for zone test.dyndns set to 2012060702
+Check that test.dyndns. still has a valid ordername
+--- Start: diff start step.1 ---
+no difference
+--- End: diff start step.1 ---
+
diff --git a/regression-tests/tests/pdnsutil-increase-serial/skip.nodyndns b/regression-tests/tests/pdnsutil-increase-serial/skip.nodyndns
@@ -0,0 +1 @@
+Skip this test if the backend does not support dyndns/rfc2136