From: Miod Vallat <miod.vallat@powerdns.com>
Date: Mon, 21 Jul 2025 06:34:04 +0000 (+0200)
Subject: pdnsutil tsigkey {de,}activate: do not setDomainMetadata with unchanged data.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F15873%2Fhead;p=thirdparty%2Fpdns.git

pdnsutil tsigkey {de,}activate: do not setDomainMetadata with unchanged data.

Signed-off-by: Miod Vallat <miod.vallat@powerdns.com>
---

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 601b3eb13b..75d22396bb 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -4687,13 +4687,16 @@ static int activateTSIGKey(vector<string>& cmds, const std::string_view synopsis
   }
   if (!found) {
     meta.push_back(name);
-  }
-  if (B.setDomainMetadata(zname, metaKey, meta)) {
-    cout << "Enabled TSIG key " << name << " for " << zname << endl;
+    if (B.setDomainMetadata(zname, metaKey, meta)) {
+      cout << "Enabled TSIG key " << name << " for " << zname << endl;
+    }
+    else {
+      cerr << "Failure enabling TSIG key " << name << " for " << zname << endl;
+      return 1;
+    }
   }
   else {
-    cerr << "Failure enabling TSIG key " << name << " for " << zname << endl;
-    return 1;
+    cout << "TSIG key " << name << " is already enabled in zone " << zname << endl;
   }
   return 0;
 }
@@ -4735,13 +4738,16 @@ static int deactivateTSIGKey(vector<string>& cmds, const std::string_view synops
   }
   if (iter != meta.end()) {
     meta.erase(iter);
-  }
-  if (B.setDomainMetadata(zname, metaKey, meta)) {
-    cout << "Disabled TSIG key " << name << " for " << zname << endl;
+    if (B.setDomainMetadata(zname, metaKey, meta)) {
+      cout << "Disabled TSIG key " << name << " for " << zname << endl;
+    }
+    else {
+      cerr << "Failure disabling TSIG key " << name << " for " << zname << endl;
+      return 1;
+    }
   }
   else {
-    cerr << "Failure disabling TSIG key " << name << " for " << zname << endl;
-    return 1;
+    cout << "TSIG key " << name << " is not currently enabled in zone " << zname << endl;
   }
   return 0;
 }