From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 26 Nov 2015 19:30:19 +0000 (+0100)
Subject: further straightforward cases
X-Git-Tag: dnsdist-1.0.0-alpha1~176^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff05fd125ffb5da9ec91cb02f4e6cae6bd4c3b9f;p=thirdparty%2Fpdns.git

further straightforward cases
---

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index a4c7748dc2..363fb188d4 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -392,7 +392,7 @@ void rectifyAllZones(DNSSECKeeper &dk)
   vector<DomainInfo> domainInfo;
 
   B.getAllDomains(&domainInfo);
-  BOOST_FOREACH(DomainInfo di, domainInfo) {
+  for(DomainInfo di :  domainInfo) {
     cerr<<"Rectifying "<<di.zone.toString()<<": ";
     rectifyZone(dk, di.zone);
   }
@@ -1093,7 +1093,7 @@ bool disableDNSSECOnZone(DNSSECKeeper& dk, const DNSName& zone)
     cerr << "No keys for zone '"<<zone.toString()<<"'."<<endl;
   }
   else {  
-    BOOST_FOREACH(DNSSECKeeper::keyset_t::value_type value, keyset) {
+    for(DNSSECKeeper::keyset_t::value_type value :  keyset) {
       dk.deactivateKey(zone, value.second.id);
       dk.removeKey(zone, value.second.id);
     }
@@ -1142,7 +1142,7 @@ bool showZone(DNSSECKeeper& dk, const DNSName& zone)
       cout<<"Zone has " << (narrow ? "NARROW " : "") <<"hashed NSEC3 semantics, configuration: "<<ns3pr.getZoneRepresentation()<<endl;
   
     cout << "keys: "<<endl;
-    BOOST_FOREACH(DNSSECKeeper::keyset_t::value_type value, keyset) {
+    for(DNSSECKeeper::keyset_t::value_type value :  keyset) {
       string algname;
       algorithm2name(value.first.d_algorithm, algname);
       if (value.first.getKey()->getBits() < 1) {
@@ -1257,7 +1257,7 @@ bool secureZone(DNSSECKeeper& dk, const DNSName& zone)
   for(vector<string>::iterator i = k_algos.begin()+1; i != k_algos.end(); i++)
     dk.addKey(zone, true, shorthand2algorithm(*i), k_size, true); // obvious errors will have been caught above
 
-  BOOST_FOREACH(string z_algo, z_algos)
+  for(string z_algo :  z_algos)
   {
     int algo = shorthand2algorithm(z_algo);
     dk.addKey(zone, false, algo, z_size);
@@ -1503,7 +1503,7 @@ try
       SSQLite3 db(cmds[1], true); // create=ok
       vector<string> statements;
       stringtok(statements, sqlCreate, ";");
-      BOOST_FOREACH(const string& statement, statements) {
+      for(const string& statement :  statements) {
         db.execute(statement);
       }
     }
@@ -1794,7 +1794,7 @@ try
     B.getAllDomains(&domainInfo);
 
     unsigned int zonesSecured=0, zoneErrors=0;
-    BOOST_FOREACH(DomainInfo di, domainInfo) {
+    for(DomainInfo di :  domainInfo) {
       if(!dk.isSecuredZone(di.zone)) {
         cout<<"Securing "<<di.zone.toString()<<": ";
         if (secureZone(dk, di.zone)) {
@@ -2197,7 +2197,7 @@ try
      std::vector<struct TSIGKey> keys;
      UeberBackend B("default");
      if (B.getTSIGKeys(keys)) {
-        BOOST_FOREACH(const struct TSIGKey &key, keys) {
+        for(const struct TSIGKey &key :  keys) {
            cout << key.name.toString() << " " << key.algorithm.toString() << " " << key.key << endl;
         }
      }
@@ -2225,7 +2225,7 @@ try
        return 1;
      }
      bool found = false;
-     BOOST_FOREACH(std::string tmpname, meta) {
+     for(std::string tmpname :  meta) {
           if (tmpname == name) { found = true; break; }
      }
      if (!found) meta.push_back(name);
@@ -2287,7 +2287,7 @@ try
     if (cmds.size() > 2) {
       keys.assign(cmds.begin() + 2, cmds.end());
       std::cout << "Metadata for '" << zone << "'" << endl;
-      BOOST_FOREACH(const string kind, keys) {
+      for(const string kind :  keys) {
         vector<string> meta;
         meta.clear();
         if (B.getDomainMetadata(zone, kind, meta)) {
@@ -2371,7 +2371,7 @@ try
      B.getDomainKeys(zone, 0, keys);
      id = -1;
 
-     BOOST_FOREACH(DNSBackend::KeyData& kd, keys) {
+     for(DNSBackend::KeyData& kd :  keys) {
        if (kd.content == iscString.str()) {
          // it's this one, I guess...
          id = kd.id;
@@ -2394,7 +2394,7 @@ try
      B.getDomainKeys(zone, 0, keys);
 
      // validate which one got the key...
-     BOOST_FOREACH(DNSBackend::KeyData& kd, keys) {
+     for(DNSBackend::KeyData& kd :  keys) {
        if (kd.content == iscString.str()) {
          // it's this one, I guess...
          id = kd.id;
@@ -2430,7 +2430,7 @@ try
 
       DNSCryptoKeyEngine *dke = NULL;
       // lookup correct key      
-      BOOST_FOREACH(DNSBackend::KeyData &kd, keys) {
+      for(DNSBackend::KeyData &kd :  keys) {
         if (kd.id == id) {
           // found our key. 
           DNSKEYRecordContent dkrc;
diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index 5689605f18..a639b9b84f 100644
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -93,7 +93,7 @@ string getAllStats()
   typedef map<string, string> varmap_t;
   varmap_t varmap = getAllStatsMap();
   string ret;
-  BOOST_FOREACH(varmap_t::value_type& tup, varmap) {
+  for(varmap_t::value_type& tup :  varmap) {
     ret += tup.first + "\t" + tup.second +"\n";
   }
   return ret;
@@ -148,7 +148,7 @@ static uint64_t dumpNegCache(SyncRes::negcache_t& negcache, int fd)
   sequence_t& sidx=negcache.get<1>();
 
   uint64_t count=0;
-  BOOST_FOREACH(const NegCacheEntry& neg, sidx)
+  for(const NegCacheEntry& neg :  sidx)
   {
     ++count;
     fprintf(fp, "%s IN %s %d VIA %s\n", neg.d_name.toString().c_str(), neg.d_qtype.getName().c_str(), (unsigned int) (neg.d_ttd - now), neg.d_qname.toString().c_str());
@@ -659,7 +659,7 @@ vector<pair<DNSName, uint16_t> >* pleaseGetQueryRing()
     return ret;
   ret->reserve(t_queryring->size());
 
-  BOOST_FOREACH(const query_t& q, *t_queryring) {
+  for(const query_t& q :  *t_queryring) {
     ret->push_back(q);
   }
   return ret;
@@ -671,7 +671,7 @@ vector<pair<DNSName,uint16_t> >* pleaseGetServfailQueryRing()
   if(!t_servfailqueryring)
     return ret;
   ret->reserve(t_queryring->size());
-  BOOST_FOREACH(const query_t& q, *t_servfailqueryring) {
+  for(const query_t& q :  *t_servfailqueryring) {
     ret->push_back(q);
   }
   return ret;
@@ -689,7 +689,7 @@ vector<ComboAddress>* pleaseGetRemotes()
     return ret;
 
   ret->reserve(t_remotes->size());
-  BOOST_FOREACH(const ComboAddress& ca, *t_remotes) {
+  for(const ComboAddress& ca :  *t_remotes) {
     ret->push_back(ca);
   }
   return ret;
@@ -701,7 +701,7 @@ vector<ComboAddress>* pleaseGetServfailRemotes()
   if(!t_servfailremotes)
     return ret;
   ret->reserve(t_servfailremotes->size());
-  BOOST_FOREACH(const ComboAddress& ca, *t_servfailremotes) {
+  for(const ComboAddress& ca :  *t_servfailremotes) {
     ret->push_back(ca);
   }
   return ret;
@@ -713,7 +713,7 @@ vector<ComboAddress>* pleaseGetLargeAnswerRemotes()
   if(!t_largeanswerremotes)
     return ret;
   ret->reserve(t_largeanswerremotes->size());
-  BOOST_FOREACH(const ComboAddress& ca, *t_largeanswerremotes) {
+  for(const ComboAddress& ca :  *t_largeanswerremotes) {
     ret->push_back(ca);
   }
   return ret;
@@ -727,7 +727,7 @@ string doGenericTopRemotes(pleaseremotefunc_t func)
   vector<ComboAddress> remotes=broadcastAccFunction<vector<ComboAddress> >(func);
     
   unsigned int total=0;
-  BOOST_FOREACH(const ComboAddress& ca, remotes) {
+  for(const ComboAddress& ca :  remotes) {
     total++;
     counts[ca]++;
   }
@@ -777,7 +777,7 @@ DNSName getRegisteredName(const DNSName& dom)
   if(parts.size()<=2)
     return dom;
   reverse(parts.begin(), parts.end());
-  BOOST_FOREACH(string& str, parts) { str=toLower(str); };
+  for(string& str :  parts) { str=toLower(str); };
 
   // uk co migweb 
   string last;
@@ -813,7 +813,7 @@ string doGenericTopQueries(pleasequeryfunc_t func, boost::function<DNSName(const
   vector<query_t> queries=broadcastAccFunction<vector<query_t> >(func);
     
   unsigned int total=0;
-  BOOST_FOREACH(const query_t& q, queries) {
+  for(const query_t& q :  queries) {
     total++;
     counts[make_pair(filter(q.first),q.second)]++;
   }
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 0ae903f983..86f46bf528 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -423,7 +423,7 @@ bool TCPNameserver::canDoAXFR(shared_ptr<DNSPacket> q)
     if (q->d_tsig_algo == TSIG_GSS) {
       vector<string> princs;
       s_P->getBackend()->getDomainMetadata(q->qdomain, "GSS-ALLOW-AXFR-PRINCIPAL", princs);
-      BOOST_FOREACH(const std::string& princ, princs) {
+      for(const std::string& princ :  princs) {
         if (q->d_peer_principal == princ) {
           L<<Logger::Warning<<"AXFR of domain '"<<q->qdomain<<"' allowed: TSIG signed request with authorized principal '"<<q->d_peer_principal<<"' and algorithm 'gss-tsig'"<<endl;
           return true;
@@ -666,7 +666,7 @@ int TCPNameserver::doAXFR(const DNSName &target, shared_ptr<DNSPacket> q, int ou
   dk.getFromMeta(q->qdomain, "PUBLISH_CDS", publishCDS);
   vector<DNSResourceRecord> cds, cdnskey;
 
-  BOOST_FOREACH(const DNSSECKeeper::keyset_t::value_type& value, keys) {
+  for(const DNSSECKeeper::keyset_t::value_type& value :  keys) {
     rr.qtype = QType(QType::DNSKEY);
     rr.content = value.first.getDNSKEY().getZoneRepresentation();
     string keyname = NSEC3Zone ? hashQNameWithSalt(ns3pr, rr.qname) : labelReverse(rr.qname.toString());
@@ -761,7 +761,7 @@ int TCPNameserver::doAXFR(const DNSName &target, shared_ptr<DNSPacket> q, int ou
 
   if(rectify) {
     // set auth
-    BOOST_FOREACH(DNSResourceRecord &rr, rrs) {
+    for(DNSResourceRecord &rr :  rrs) {
       rr.auth=true;
       if (rr.qtype.getCode() != QType::NS || rr.qname!=target) {
         DNSName shorter(rr.qname);
@@ -779,7 +779,7 @@ int TCPNameserver::doAXFR(const DNSName &target, shared_ptr<DNSPacket> q, int ou
       // ents are only required for NSEC3 zones
       uint32_t maxent = ::arg().asNum("max-ent-entries");
       map<DNSName,bool> nonterm;
-      BOOST_FOREACH(DNSResourceRecord &rr, rrs) {
+      for(DNSResourceRecord &rr :  rrs) {
         DNSName shorter(rr.qname);
         while(shorter != target && shorter.chopOff()) {
           if(!qnames.count(shorter)) {
@@ -1235,7 +1235,7 @@ void TCPNameserver::thread()
         continue;
 
       int sock=-1;
-      BOOST_FOREACH(const struct pollfd& pfd, d_prfds) {
+      for(const struct pollfd& pfd :  d_prfds) {
         if(pfd.revents == POLLIN) {
           sock = pfd.fd;
           addrlen=sizeof(remote);
diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index ce19f096df..c1f77dac8b 100644
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -306,7 +306,7 @@ static void fillZoneInfo(const DomainInfo& di, Value& jdi, Document& doc) {
   jdi.AddMember("account", di.account.c_str(), doc.GetAllocator());
   Value masters;
   masters.SetArray();
-  BOOST_FOREACH(const string& master, di.masters) {
+  for(const string& master :  di.masters) {
     Value value(master.c_str(), doc.GetAllocator());
     masters.PushBack(value, doc.GetAllocator());
   }
@@ -382,7 +382,7 @@ static void fillZone(const DNSName& zonename, HttpResponse* resp) {
 void productServerStatisticsFetch(map<string,string>& out)
 {
   vector<string> items = S.getEntries();
-  BOOST_FOREACH(const string& item, items) {
+  for(const string& item :  items) {
     out[item] = lexical_cast<string>(S.read(item));
   }
 
@@ -518,7 +518,7 @@ static void apiZoneCryptokeys(HttpRequest* req, HttpResponse* resp) {
   Document doc;
   doc.SetArray();
 
-  BOOST_FOREACH(DNSSECKeeper::keyset_t::value_type value, keyset) {
+  for(DNSSECKeeper::keyset_t::value_type value :  keyset) {
     if (req->parameters.count("key_id")) {
       int keyid = lexical_cast<int>(req->parameters["key_id"]);
       int curid = lexical_cast<int>(value.second.id);
@@ -742,7 +742,7 @@ static void apiServerZones(HttpRequest* req, HttpResponse* resp) {
   Document doc;
   doc.SetArray();
 
-  BOOST_FOREACH(const DomainInfo& di, domains) {
+  for(const DomainInfo& di :  domains) {
     Value jdi;
     fillZoneInfo(di, jdi, doc);
     doc.PushBack(jdi, doc.GetAllocator());
@@ -988,7 +988,7 @@ static void patchZone(HttpRequest* req, HttpResponse* resp) {
         gatherRecords(rrset, new_records, new_ptrs);
         gatherComments(rrset, new_comments, true);
 
-        BOOST_FOREACH(DNSResourceRecord& rr, new_records) {
+        for(DNSResourceRecord& rr :  new_records) {
           rr.domain_id = di.id;
 
           if (rr.qname != qname || rr.qtype != qtype)
@@ -999,7 +999,7 @@ static void patchZone(HttpRequest* req, HttpResponse* resp) {
           }
         }
 
-        BOOST_FOREACH(Comment& c, new_comments) {
+        for(Comment& c :  new_comments) {
           c.domain_id = di.id;
         }
 
@@ -1055,7 +1055,7 @@ static void patchZone(HttpRequest* req, HttpResponse* resp) {
   PC.purge(zonename.toString()); // XXX DNSName pain - this seems the wrong way round!
 
   // now the PTRs
-  BOOST_FOREACH(const DNSResourceRecord& rr, new_ptrs) {
+  for(const DNSResourceRecord& rr :  new_ptrs) {
     DNSPacket fakePacket;
     SOAData sd;
     sd.db = (DNSBackend *)-1;  // getAuth() cache bypass