From: Miod Vallat <miod.vallat@powerdns.com>
Date: Mon, 11 Aug 2025 12:18:31 +0000 (+0200)
Subject: Exit earlier if no changes in the edit.
X-Git-Tag: rec-5.4.0-alpha1~369^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36591c40e9ae9b026f0002fc9259b3c986f97497;p=thirdparty%2Fpdns.git

Exit earlier if no changes in the edit.

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

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 5f473378a2..95a60f03a3 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -2102,6 +2102,10 @@ static int editZone(const ZoneName &zone, const PDNSColors& col)
           changed[{diff.d_name,diff.d_type}]+=str.str();
         }
       }
+      if (changed.empty()) {
+        cout<<endl<<"No changes to apply."<<endl;
+        return(EXIT_SUCCESS);
+      }
       cout<<"Detected the following changes:"<<endl;
       for(auto& change : changed) {
         cout<<change.second;
@@ -2112,7 +2116,7 @@ static int editZone(const ZoneName &zone, const PDNSColors& col)
       }
       // If the SOA record has not been modified, ask the user if they want to
       // update the serial number.
-      if (!changed.empty() && isSameZoneSerial(soa, info, post)) {
+      if (isSameZoneSerial(soa, info, post)) {
         state = ASKSOA;
       }
       else {
@@ -2151,10 +2155,6 @@ static int editZone(const ZoneName &zone, const PDNSColors& col)
       }
       break;
     case ASKAPPLY:
-      if(changed.empty()) {
-        cout<<endl<<"No changes to apply."<<endl;
-        return(EXIT_SUCCESS);
-      }
       cout<<endl<<"(a)pply these changes, (e)dit again, (r)etry with original zone, (q)uit: "<<std::flush;
       resp = ::tolower(read1char());
       if (resp != '\n') {