From: Pieter Lexis <pieterlexis@users.noreply.github.com>
Date: Wed, 9 Jan 2019 10:59:59 +0000 (+0100)
Subject: Merge pull request #7289 from chbruyand/static-cppcheck
X-Git-Tag: rec-4.2.0-alpha1~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de05f7f502cad8a7552c9b46833ab563281c2bbf;p=thirdparty%2Fpdns.git

Merge pull request #7289 from chbruyand/static-cppcheck

Fix minor warnings reported by the compiler or cppcheck
---

de05f7f502cad8a7552c9b46833ab563281c2bbf
diff --cc pdns/tcpreceiver.cc
index 7c7fec0aa6,cf573c5788..706305c87a
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@@ -951,17 -951,15 +951,17 @@@ int TCPNameserver::doAXFR(const DNSNam
        for(nsecxrepo_t::const_iterator iter = nsecxrepo.begin(); iter != nsecxrepo.end(); ++iter) {
          if(iter->second.d_auth) {
            NSEC3RecordContent n3rc;
 -          n3rc.d_set = iter->second.d_set;
 -          if (n3rc.d_set.size() && (n3rc.d_set.size() != 1 || !n3rc.d_set.count(QType::NS)))
 -            n3rc.d_set.insert(QType::RRSIG);
 -          n3rc.d_salt=ns3pr.d_salt;
 +          n3rc.set(iter->second.d_set);
 +          const auto numberOfTypesSet = n3rc.numberOfTypesSet();
 +          if (numberOfTypesSet != 0 && (numberOfTypesSet != 1 || !n3rc.isSet(QType::NS))) {
 +            n3rc.set(QType::RRSIG);
 +          }
 +          n3rc.d_salt = ns3pr.d_salt;
            n3rc.d_flags = ns3pr.d_flags;
            n3rc.d_iterations = ns3pr.d_iterations;
 -          n3rc.d_algorithm = 1; // SHA1, fixed in PowerDNS for now
 +          n3rc.d_algorithm = DNSSECKeeper::SHA1; // SHA1, fixed in PowerDNS for now
            nsecxrepo_t::const_iterator inext = iter;
-           inext++;
+           ++inext;
            if(inext == nsecxrepo.end())
              inext = nsecxrepo.begin();
            while(!inext->second.d_auth && inext != iter)