From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 12 Apr 2018 15:15:31 +0000 (+0200)
Subject: ixfrutil: ensure it does not print by itself
X-Git-Tag: dnsdist-1.3.1~148^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f79adaa35ff32c22e65841079a6337289727f458;p=thirdparty%2Fpdns.git

ixfrutil: ensure it does not print by itself
---

diff --git a/pdns/ixfrutils.cc b/pdns/ixfrutils.cc
index d7d0cd6173..6957e9d647 100644
--- a/pdns/ixfrutils.cc
+++ b/pdns/ixfrutils.cc
@@ -139,11 +139,7 @@ void loadZoneFromDisk(records_t& records, const string& fname, const DNSName& zo
       seenSOA=true;
     }
   }
-  cout<<"Parsed "<<nrecords<<" records"<<endl;
-  if(rr.qtype.getCode() == QType::SOA && seenSOA) {
-    cout<<"Zone was complete (SOA at end)"<<endl;
-  }
-  else  {
+  if(!(rr.qtype.getCode() == QType::SOA && seenSOA)) {
     records.clear();
     throw runtime_error("Zone not complete!");
   }
diff --git a/pdns/ixplore.cc b/pdns/ixplore.cc
index b06eaf0f3d..3ab4999179 100644
--- a/pdns/ixplore.cc
+++ b/pdns/ixplore.cc
@@ -76,8 +76,12 @@ int main(int argc, char** argv) {
       DNSName zone(argv[2]);
       cout<<"Loading before from "<<argv[3]<<endl;
       loadZoneFromDisk(before, argv[3], zone);
+      cout<<"Parsed "<<before.size()<<" records"<<endl;
+      cout<<"Zone was complete (SOA at end)"<<endl;
       cout<<"Loading after from "<<argv[4]<<endl;
       loadZoneFromDisk(after, argv[4], zone);
+      cout<<"Parsed "<<after.size()<<" records"<<endl;
+      cout<<"Zone was complete (SOA at end)"<<endl;
 
       vector<DNSRecord> diff;
 
@@ -133,6 +137,8 @@ int main(int argc, char** argv) {
       string fname=directory+"/"+std::to_string(ourSerial);
       cout<<"Loading serial number "<<ourSerial<<" from file "<<fname<<endl;
       loadZoneFromDisk(records, fname, zone);
+      cout<<"Parsed "<<records.size()<<" records"<<endl;
+      cout<<"Zone was complete (SOA at end)"<<endl;
     }
     catch(std::exception& e) {
       cout<<"Could not load zone from disk: "<<e.what()<<endl;