From: Kees Monshouwer <mind04@monshouwer.org>
Date: Sun, 23 Feb 2014 18:41:05 +0000 (+0100)
Subject: saxfr: fix next owner name hiding
X-Git-Tag: rec-3.6.0-rc1~169^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=702581e47cc2db00aad5b700b9cff2462a2e7922;p=thirdparty%2Fpdns.git

saxfr: fix next owner name hiding
---

diff --git a/pdns/saxfr.cc b/pdns/saxfr.cc
index 53f0108529..4bcdfdb09e 100644
--- a/pdns/saxfr.cc
+++ b/pdns/saxfr.cc
@@ -94,12 +94,17 @@ try
         stringtok(parts, zoneRep);
         o<<"\t"<<i->first.d_ttl<<"\t"<< parts[0]<<" "<<parts[1]<<" "<<parts[2]<<" "<<parts[3]<<" [expiry] [inception] [keytag] "<<parts[7]<<" ...";
       }
-      else if(!showflags && i->first.d_type == QType::NSEC3)
+      else if(i->first.d_type == QType::NSEC3)
       {
         string zoneRep = i->first.d_content->getZoneRepresentation();
         vector<string> parts;
         stringtok(parts, zoneRep);
-        o<<"\t"<<i->first.d_ttl<<"\t"<< parts[0]<<" [flags] "<<parts[2]<<" "<<parts[3]<<" "<<"[next owner]";
+        o<<"\t"<<i->first.d_ttl<<"\t"<<parts[0]<<" ";
+        if (showflags)
+          o<<parts[1];
+        else
+          o<<"[flags]";
+        o<<" "<<parts[2]<<" "<<parts[3]<<" "<<"[next owner]";
         for(vector<string>::iterator iter = parts.begin()+5; iter != parts.end(); ++iter)
           o<<" "<<*iter;
       }